Skip to content

Commit b8fcee3

Browse files
committed
use pipx
1 parent 246bce7 commit b8fcee3

File tree

2 files changed

+3
-12
lines changed

2 files changed

+3
-12
lines changed

.github/workflows/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ RUN --mount=type=bind,source=.,target=/scenario_execution \
2020
rm -rf /var/lib/apt/lists/*
2121

2222
# install dependencies for license check
23-
RUN pipx install ros-license-toolkit==1.3.0 && \
23+
RUN PIPX_HOME="" PIPX_BIN_DIR="/python_bin" pipx install -v ros-license-toolkit==1.2.2 && \
2424
go install github.com/google/[email protected]
2525

2626
# install pybullet dependencies

.github/workflows/scan.yml

+2-11
Original file line numberDiff line numberDiff line change
@@ -65,19 +65,10 @@ jobs:
6565
name: License check
6666
runs-on: ubuntu-latest
6767
container:
68-
image: ros:jazzy-ros-base
68+
image: ghcr.io/cps-test-lab/scenario-execution
6969
steps:
7070
- name: Checkout code
7171
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
72-
- name: Prepare System
73-
shell: bash
74-
run: |
75-
apt update
76-
apt install -y pipx
77-
pipx install ros-license-toolkit==1.3.0
78-
apt install -y golang-go
79-
go version
80-
go install github.com/google/[email protected]
8172
- name: Check for license tags
8273
shell: bash
8374
run: |
@@ -94,6 +85,6 @@ jobs:
9485
continue
9586
fi
9687
echo "Processing package at $pkg_dir"
97-
ros_license_toolkit "$pkg_dir"
88+
/python_bin/ros_license_toolkit "$pkg_dir"
9889
done
9990

0 commit comments

Comments
 (0)