From fa35524f10e4f24246f3b314030414ec8662c55b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Fritze?= Date: Thu, 3 Nov 2022 13:26:05 +0100 Subject: [PATCH] fixup! fixup! fixup! On-push-wheel test --- .github/workflows/Dockerfile | 4 +++- .github/workflows/manual_test.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/Dockerfile b/.github/workflows/Dockerfile index 1733d40..8487469 100644 --- a/.github/workflows/Dockerfile +++ b/.github/workflows/Dockerfile @@ -1,7 +1,9 @@ ARG BASEOS=slim-bullseye FROM python:3.11-${BASEOS} +ARG PLATFORM=manylinux + COPY test /src/test -COPY wheelhouse/clang*whl /tmp +COPY wheelhouse/clang*${PLATFORM}*.whl /tmp RUN python -m pip install pytest /tmp/*whl \ && pytest -vs /src/test diff --git a/.github/workflows/manual_test.yml b/.github/workflows/manual_test.yml index 323e57a..c10c1ea 100644 --- a/.github/workflows/manual_test.yml +++ b/.github/workflows/manual_test.yml @@ -89,9 +89,9 @@ jobs: if: runner.os == 'Linux' && !(matrix.use_qemu) && matrix.arch == 'x86_64' run: | if [[ "${{matrix.skip}}" == "*manylinux*" ]] ; then - docker build --build-arg BASEOS=slim-bullseye -f .github/workflows/Dockerfile . + docker build --build-arg BASEOS=alpine3.16 --build-arg PLATFORM=musllinux -f .github/workflows/Dockerfile . else - docker build --build-arg BASEOS=alpine3.16 -f .github/workflows/Dockerfile . + docker build --build-arg BASEOS=slim-bullseye --build-arg PLATFORM=manylinux -f .github/workflows/Dockerfile . fi - uses: actions/upload-artifact@v3 if: always() diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3f4bf7c..8a2e02b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -105,9 +105,9 @@ jobs: if: runner.os == 'Linux' && !(matrix.use_qemu) && matrix.arch == 'x86_64' run: | if [[ "${{matrix.skip}}" == "*manylinux*" ]] ; then - docker build --build-arg BASEOS=slim-bullseye -f .github/workflows/Dockerfile . + docker build --build-arg BASEOS=alpine3.16 --build-arg PLATFORM=musllinux -f .github/workflows/Dockerfile . else - docker build --build-arg BASEOS=alpine3.16 -f .github/workflows/Dockerfile . + docker build --build-arg BASEOS=slim-bullseye --build-arg PLATFORM=manylinux -f .github/workflows/Dockerfile . fi - uses: actions/upload-artifact@v3 if: (!matrix.use_qemu) || fromJSON(env.USE_QEMU)