Skip to content

Commit 3653a59

Browse files
committed
ci: switch c2rust-testsuite to use uv
`c2rust-testsuite/test.py` already is set up to use `uv`, but we also need a `uv tool install scan-build` for `intercept-build` (which is what was left in `requirements.txt`).
1 parent 56c8128 commit 3653a59

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

.github/workflows/internal-testsuite.yml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ jobs:
6767
${{ github.workspace }}/testsuite/tests/**/compile_commands.json
6868
key: ${{ runner.os }}-${{ hashFiles('**/Cargo.lock', '**/c2rust-ast-exporter/**/CMakeLists.txt', '**/examples/**/CMakeLists.txt') }}
6969

70-
- name: Cache Python - pip
71-
uses: actions/cache@v4
72-
with:
73-
path: ~/.cache/pip
74-
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
70+
- uses: astral-sh/setup-uv@v6
71+
72+
- name: Install Python Packages
73+
run: |
74+
uv tool install scan-build # for `intercept-build`
7575
7676
# TODO(pl): Figure out why json-c fails when caching compile commands
7777
# - name: Get Image Version
@@ -111,17 +111,11 @@ jobs:
111111
librtmp-dev \
112112
libtool \
113113
libzstd-dev \
114-
python3-setuptools \
115-
python3-wheel \
116114
rcs \
117115
tcl-dev \
118116
tk-dev \
119117
zlib1g-dev
120118
121-
# installs intercept-build to $HOME/.local/bin
122-
- name: Provision Python Packages
123-
run: python3 -m pip install -r $GITHUB_WORKSPACE/testsuite/requirements.txt
124-
125119
# Runs a single command using the runners shell
126120
# Working dir is /home/runner/work/c2rust/c2rust
127121
- name: Build c2rust
@@ -136,7 +130,7 @@ jobs:
136130
export PATH=$PWD/target/release:$HOME/.local/bin:$PATH
137131
echo "PATH=$PATH"
138132
export C2RUST_DIR=$PWD
139-
python3 testsuite/test.py curl json-c lua nginx zstd libxml2 python2
133+
./testsuite/test.py curl json-c lua nginx zstd libxml2 python2
140134
141135
- uses: actions/upload-artifact@v4
142136
with:

0 commit comments

Comments
 (0)