Skip to content

Commit 661f268

Browse files
committed
ci: Adjusting pip install for muslcc container
Signed-off-by: Tyler Erickson <[email protected]>
1 parent 1328152 commit 661f268

File tree

1 file changed

+18
-5
lines changed

1 file changed

+18
-5
lines changed

.github/workflows/meson.yml

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,6 @@ jobs:
222222
with:
223223
arch: ${{ matrix.config.arch }}
224224

225-
# TODO: Cache the docker container
226-
227225
- name: Get latest LLVM version
228226
if: startsWith(matrix.config.name, 'Windows Clang')
229227
run: |
@@ -284,14 +282,29 @@ jobs:
284282
echo "DESTDIR=${DESTDIR}" >> $GITHUB_ENV
285283
shell: bash
286284

287-
- name: Configuring and compiling with meson
285+
- name: Install Meson and Ninja (container)
286+
if: matrix.config.image != ''
287+
run: |
288+
python3 -m venv /tmp/venv
289+
. /tmp/venv/bin/activate
290+
pip install meson ninja
291+
echo "VENV_PYTHON=/tmp/venv/bin/python3" >> $GITHUB_ENV
292+
echo "VENV_MESON=/tmp/venv/bin/meson" >> $GITHUB_ENV
293+
294+
295+
- name: Install Meson and Ninja (Github runners)
296+
if: matrix.config.image == ''
288297
env:
289298
CC: ${{ matrix.config.cc }}
290299
CXX: ${{ matrix.config.cxx }}
291300
run: |
292301
pip install meson ninja
293-
meson setup build -Dprefix=/ -Dmandir=/man -Dbindir=/ ${{ matrix.config.meson_opts }} --buildtype=release
294-
meson install -C build
302+
303+
- name: Configure and build with Meson
304+
run: |
305+
${VENV_MESON:-meson} setup build -Dprefix=/ -Dmandir=/man -Dbindir=/ ${{ matrix.config.meson_opts }} --buildtype=release
306+
${VENV_MESON:-meson} install -C build
307+
295308
296309
# add `GOBIN` to the `PATH` otherwise nfpm in next step can't be found
297310
- uses: actions/setup-go@v5

0 commit comments

Comments
 (0)