From 10df873efa3159724690fe4fcabb0802d58f56ee Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 25 Dec 2023 17:34:15 -0800 Subject: [PATCH 01/13] tox.ini [DOCKER_BUILDKIT=1]: Do not attempt to retrieve a failed container from buildkit --- tox.ini | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index 3673833724c..ae2db7923b7 100644 --- a/tox.ini +++ b/tox.ini @@ -756,7 +756,7 @@ commands = docker: BUILD_IMAGE=$DOCKER_PUSH_REPOSITORY$BUILD_IMAGE_STEM-$docker_target; \ docker: BUILD_TAG={env:DOCKER_TAG:$(git describe --dirty --always)}; \ docker: TAG_ARGS=$(for tag in $BUILD_TAG {env:EXTRA_DOCKER_TAGS:}; do echo --tag $BUILD_IMAGE:$tag; done); \ - docker: DOCKER_BUILDKIT={env:DOCKER_BUILDKIT:0} \ + docker: DOCKER_BUILDKIT={env:DOCKER_BUILDKIT:0}; \ docker: docker build . -f {envdir}/Dockerfile \ docker: --target $docker_target \ docker: $TAG_ARGS \ @@ -769,12 +769,16 @@ commands = docker: --build-arg TARGETS_OPTIONAL="{env:TARGETS_OPTIONAL:ptest}" \ docker: {env:EXTRA_DOCKER_BUILD_ARGS:}; status=$?; \ docker: if [ $status != 0 ]; then \ - docker: BUILD_TAG="$BUILD_TAG-failed"; docker commit $(docker ps -l -q) $BUILD_IMAGE:$BUILD_TAG; PUSH_TAGS=$BUILD_IMAGE:$BUILD_TAG; \ + docker: if [ $DOCKER_BUILDKIT = 0 ]; then \ + docker: BUILD_TAG="$BUILD_TAG-failed"; docker commit $(docker ps -l -q) $BUILD_IMAGE:$BUILD_TAG; PUSH_TAGS=$BUILD_IMAGE:$BUILD_TAG; \ + docker: else \ + docker: unset BUILD_TAG; unset PUSH_TAGS; echo "DOCKER_BUILDKIT=1, so we cannot commit and tag the failed image"; \ + docker: fi; \ docker: else \ docker: PUSH_TAGS=$(echo $BUILD_IMAGE:$BUILD_TAG; for tag in {env:EXTRA_DOCKER_TAGS:}; do echo "$BUILD_IMAGE:$tag"; done); \ docker: fi; \ docker: echo $BUILD_IMAGE:$BUILD_TAG >> {envdir}/Dockertags; \ - docker: if [ x"{env:DOCKER_PUSH_REPOSITORY:}" != x ]; then \ + docker: if [ x"{env:DOCKER_PUSH_REPOSITORY:}" != x -a x"$PUSH_TAGS" != x ]; then \ docker: echo Pushing $PUSH_TAGS; \ docker: for tag in $PUSH_TAGS; do \ docker: docker push $tag || echo "(ignoring errors)"; \ From 8cd1147daa373dac8346bd96189a4d40522e046f Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 26 Dec 2023 11:14:17 -0800 Subject: [PATCH 02/13] tox.ini (docker): Move copying of logs from container here from .github/workflows/docker.yml --- .github/workflows/docker.yml | 4 +--- tox.ini | 12 +++++++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 1ee938339b3..7dd0aa5ab17 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -248,9 +248,7 @@ jobs: - name: Copy logs from the Docker image or build container run: | mkdir -p "artifacts/$LOGS_ARTIFACT_NAME" - cp -r .tox/$TOX_ENV/Dockerfile .tox/$TOX_ENV/log "artifacts/$LOGS_ARTIFACT_NAME" - if [ -f .tox/$TOX_ENV/Dockertags ]; then CONTAINERS=$(docker create $(tail -1 .tox/$TOX_ENV/Dockertags) /bin/bash || true); fi - if [ -n "$CONTAINERS" ]; then for CONTAINER in $CONTAINERS; do for ARTIFACT in /sage/logs; do docker cp $CONTAINER:$ARTIFACT artifacts/$LOGS_ARTIFACT_NAME && HAVE_LOG=1; done; if [ -n "$HAVE_LOG" ]; then break; fi; done; fi + cp -r .tox/$TOX_ENV/* "artifacts/$LOGS_ARTIFACT_NAME" if: always() - uses: actions/upload-artifact@v3 with: diff --git a/tox.ini b/tox.ini index ae2db7923b7..2c7bd3c9ffa 100644 --- a/tox.ini +++ b/tox.ini @@ -768,9 +768,10 @@ commands = docker: --build-arg TARGETS="{posargs:build}" \ docker: --build-arg TARGETS_OPTIONAL="{env:TARGETS_OPTIONAL:ptest}" \ docker: {env:EXTRA_DOCKER_BUILD_ARGS:}; status=$?; \ + docker: unset CONTAINER; \ docker: if [ $status != 0 ]; then \ docker: if [ $DOCKER_BUILDKIT = 0 ]; then \ - docker: BUILD_TAG="$BUILD_TAG-failed"; docker commit $(docker ps -l -q) $BUILD_IMAGE:$BUILD_TAG; PUSH_TAGS=$BUILD_IMAGE:$BUILD_TAG; \ + docker: BUILD_TAG="$BUILD_TAG-failed"; CONTAINER=$(docker ps -l -q); docker commit $CONTAINER $BUILD_IMAGE:$BUILD_TAG; PUSH_TAGS=$BUILD_IMAGE:$BUILD_TAG; \ docker: else \ docker: unset BUILD_TAG; unset PUSH_TAGS; echo "DOCKER_BUILDKIT=1, so we cannot commit and tag the failed image"; \ docker: fi; \ @@ -784,6 +785,15 @@ commands = docker: docker push $tag || echo "(ignoring errors)"; \ docker: done; \ docker: fi; \ + docker: if [ x"$BUILD_TAG" != x ]; then \ + docker: echo "Copying logs from the container to {envdir}/sage/"; \ + docker: docker run $BUILD_IMAGE:$BUILD_TAG bash -c " \ + docker: tar -c --ignore-failed-read -f - \ + docker: /sage/logs /sage/{prefix,venv}/var/lib/sage/installed \ + docker: ~/.sage/timings2.json /sage/pkgs/*/.tox/*/.sage/timings2.json \ + docker: /sage/pkgs/*/.tox/*/logs 2> /dev/null" \ + docker: | (cd {envdir} && tar xf -); \ + docker: fi; \ docker: if [ $status != 0 ]; then exit $status; fi; \ docker: done' # #28728: gap fails its test suite. From 5537a8271d0dff757be5e7210b63d6cf7b6c59bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20K=C3=B6ppe?= Date: Tue, 26 Dec 2023 22:30:50 +0000 Subject: [PATCH 03/13] tox.ini (docker): Only append to Dockertags if BUILD_TAG is set --- tox.ini | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 2c7bd3c9ffa..96cb2eb1173 100644 --- a/tox.ini +++ b/tox.ini @@ -778,7 +778,9 @@ commands = docker: else \ docker: PUSH_TAGS=$(echo $BUILD_IMAGE:$BUILD_TAG; for tag in {env:EXTRA_DOCKER_TAGS:}; do echo "$BUILD_IMAGE:$tag"; done); \ docker: fi; \ - docker: echo $BUILD_IMAGE:$BUILD_TAG >> {envdir}/Dockertags; \ + docker: if [ -n "$BUILD_TAG" ]; then \ + docker: echo $BUILD_IMAGE:$BUILD_TAG >> {envdir}/Dockertags; \ + docker: fi; \ docker: if [ x"{env:DOCKER_PUSH_REPOSITORY:}" != x -a x"$PUSH_TAGS" != x ]; then \ docker: echo Pushing $PUSH_TAGS; \ docker: for tag in $PUSH_TAGS; do \ From b4e6ac7cf9cf5ec5ff8bc7a174335eb084b045f4 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 26 Dec 2023 14:31:44 -0800 Subject: [PATCH 04/13] .github/workflows/docker.yml: Show Docker images as annotations, show instructions --- .github/workflows/docker.yml | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 7dd0aa5ab17..4b330c0020e 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -260,9 +260,32 @@ jobs: run: | .github/workflows/scan-logs.sh "artifacts/$LOGS_ARTIFACT_NAME" if: always() - - name: List docker images + - name: List Docker images run: | - if [ -f .tox/$TOX_ENV/Dockertags ]; then - cat .tox/$TOX_ENV/Dockertags + if [ -n "$DOCKER_PUSH_REPOSITORY" -a -f .tox/$TOX_ENV/Dockertags ]; then + echo "::notice title=Docker images pushed::$(echo $(cat .tox/$TOX_ENV/Dockertags))" + echo + echo "To pull an image and enter the container, type:" + echo + for TAG in $(cat .tox/$TOX_ENV/Dockertags); do + echo " \$ docker run -it $TAG bash" + done + echo + echo "To use an image as the base for an incremental build, type:" + echo + TOX_ENV_SANS_INCREMENTAL=${TOX_ENV/-incremental/} + DOCKER_IMAGE=${TOX_ENV_SANS_INCREMENTAL#docker-} + for TAG in $(cat .tox/$TOX_ENV/Dockertags); do + echo -n " \$" + if [ "$DOCKER_PUSH_REPOSITORY" != "ghcr.io/sagemath/sage/" ]; then + echo -n " FROM_DOCKER_REPOSITORY=$DOCKER_PUSH_REPOSITORY" + fi + eval DOCKER_TARGET=\${TAG#*$DOCKER_IMAGE-} + DOCKER_TARGET=${DOCKER_TARGET%:*} + if [ "$DOCKER_TARGET" != "with-targets" ]; then + echo -n " FROM_DOCKER_TARGET=$DOCKER_TARGET" + fi + echo " FROM_DOCKER_TAG=${TAG#*:} tox -e $TOX_ENV_SANS_INCREMENTAL-incremental" + done fi if: always() From eba5a061a1bed60b611281b1d9d48451e18fe3af Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 26 Dec 2023 14:49:26 -0800 Subject: [PATCH 05/13] build/pkgs/info: Update to 7.0.3 --- build/pkgs/info/checksums.ini | 6 +++--- build/pkgs/info/package-version.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/pkgs/info/checksums.ini b/build/pkgs/info/checksums.ini index c01f8b97505..cf6afe0684c 100644 --- a/build/pkgs/info/checksums.ini +++ b/build/pkgs/info/checksums.ini @@ -1,5 +1,5 @@ tarball=texinfo-VERSION.tar.xz -sha1=ce3776715e655400485381b8ae94e34c5632e729 -md5=a91b404e30561a5df803e6eb3a53be71 -cksum=3632265516 +sha1=356a623b88401d7c993408f33450c8104aad9df8 +md5=37bf94fd255729a14d4ea3dda119f81a +cksum=1448415744 upstream_url=https://ftp.gnu.org/gnu/texinfo/texinfo-VERSION.tar.xz diff --git a/build/pkgs/info/package-version.txt b/build/pkgs/info/package-version.txt index 21afad37646..a50da181e9b 100644 --- a/build/pkgs/info/package-version.txt +++ b/build/pkgs/info/package-version.txt @@ -1 +1 @@ -6.8 +7.0.3 From a19a34857a5aefd92280cbc571cf1b31a82edc91 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 26 Dec 2023 18:33:51 -0800 Subject: [PATCH 06/13] .github/workflows/docker.yml: Improve wording of Docker instructions --- .github/workflows/docker.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 4b330c0020e..f77328707b0 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -263,19 +263,24 @@ jobs: - name: List Docker images run: | if [ -n "$DOCKER_PUSH_REPOSITORY" -a -f .tox/$TOX_ENV/Dockertags ]; then - echo "::notice title=Docker images pushed::$(echo $(cat .tox/$TOX_ENV/Dockertags))" + set -- $(cat .tox/$TOX_ENV/Dockertags) + case $# in + 1) images="image"; one_image="the image";; + *) images="images"; one_image="one of the images";; + esac + echo "::notice title=Docker $images pushed::Pushed $images $(echo $(cat .tox/$TOX_ENV/Dockertags))" echo - echo "To pull an image and enter the container, type:" + echo "To pull $one_image and enter the container, type:" echo - for TAG in $(cat .tox/$TOX_ENV/Dockertags); do + for TAG in $*; do echo " \$ docker run -it $TAG bash" done echo - echo "To use an image as the base for an incremental build, type:" + echo "To use $one_image as the base for an incremental build, type:" echo TOX_ENV_SANS_INCREMENTAL=${TOX_ENV/-incremental/} DOCKER_IMAGE=${TOX_ENV_SANS_INCREMENTAL#docker-} - for TAG in $(cat .tox/$TOX_ENV/Dockertags); do + for TAG in $*; do echo -n " \$" if [ "$DOCKER_PUSH_REPOSITORY" != "ghcr.io/sagemath/sage/" ]; then echo -n " FROM_DOCKER_REPOSITORY=$DOCKER_PUSH_REPOSITORY" From 4826a15a8d177e3d624f024b9947d1423d31a263 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 26 Dec 2023 18:51:15 -0800 Subject: [PATCH 07/13] tox.ini (docker): Record successful pushes in Dockertags.pushed --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 96cb2eb1173..6a364fdd019 100644 --- a/tox.ini +++ b/tox.ini @@ -784,7 +784,7 @@ commands = docker: if [ x"{env:DOCKER_PUSH_REPOSITORY:}" != x -a x"$PUSH_TAGS" != x ]; then \ docker: echo Pushing $PUSH_TAGS; \ docker: for tag in $PUSH_TAGS; do \ - docker: docker push $tag || echo "(ignoring errors)"; \ + docker: if docker push $tag; then echo $tag >> {envdir}/Dockertags.pushed; else echo "(ignoring errors)"; fi; \ docker: done; \ docker: fi; \ docker: if [ x"$BUILD_TAG" != x ]; then \ From bf28d2080e0697d72bbd40e554019c6ed96c5db1 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 26 Dec 2023 19:03:18 -0800 Subject: [PATCH 08/13] .github/workflows/docker.yml: Use Dockertags.pushed --- .github/workflows/docker.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index f77328707b0..81be0a8506b 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -262,13 +262,13 @@ jobs: if: always() - name: List Docker images run: | - if [ -n "$DOCKER_PUSH_REPOSITORY" -a -f .tox/$TOX_ENV/Dockertags ]; then - set -- $(cat .tox/$TOX_ENV/Dockertags) + if [ -n "$DOCKER_PUSH_REPOSITORY" -a -f .tox/$TOX_ENV/Dockertags.pushed ]; then + set -- $(cat .tox/$TOX_ENV/Dockertags.pushed) case $# in 1) images="image"; one_image="the image";; *) images="images"; one_image="one of the images";; esac - echo "::notice title=Docker $images pushed::Pushed $images $(echo $(cat .tox/$TOX_ENV/Dockertags))" + echo "::notice title=Docker $images pushed::Pushed $images $*)" echo echo "To pull $one_image and enter the container, type:" echo @@ -292,5 +292,7 @@ jobs: fi echo " FROM_DOCKER_TAG=${TAG#*:} tox -e $TOX_ENV_SANS_INCREMENTAL-incremental" done + else + echo "No Docker images pushed" fi if: always() From e2992439d8afbf1ecac0b7424723ba7b96a7ffc0 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 26 Dec 2023 19:22:08 -0800 Subject: [PATCH 09/13] .github/workflows/docker.yml: Add instructions for the case that no Docker image is pushed --- .github/workflows/docker.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 81be0a8506b..2a95b682095 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -292,7 +292,14 @@ jobs: fi echo " FROM_DOCKER_TAG=${TAG#*:} tox -e $TOX_ENV_SANS_INCREMENTAL-incremental" done + elif [ -n "$DOCKER_PUSH_REPOSITORY" -a -f .tox/$TOX_ENV/Dockertags ]; then + echo "Unable to push Docker images to $DOCKER_PUSH_REPOSITORY." + echo "This is normal in a pull request to sagemath/sage or to another user's repository." + echo + echo "If you need Docker images, " + echo " - either run this GitHub Actions workflow in your repository fork" + echo " - or use the method described in https://doc.sagemath.org/html/en/developer/portability_testing.html#automatic-docker-based-build-testing-using-tox else - echo "No Docker images pushed" + echo "No Docker images created." fi - if: always() + if: always() && ${{ inputs.docker_push_repository }} From 755fd97dc7b073f28dcb97d8757a185b0de882dc Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 26 Dec 2023 21:41:46 -0800 Subject: [PATCH 10/13] .github/workflows/docker.yml: Fix up --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 2a95b682095..9ea69233574 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -298,7 +298,7 @@ jobs: echo echo "If you need Docker images, " echo " - either run this GitHub Actions workflow in your repository fork" - echo " - or use the method described in https://doc.sagemath.org/html/en/developer/portability_testing.html#automatic-docker-based-build-testing-using-tox + echo " - or use the method described in https://doc.sagemath.org/html/en/developer/portability_testing.html#automatic-docker-based-build-testing-using-tox" else echo "No Docker images created." fi From 358909a319bca66b68efc906f926d05062972f26 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Wed, 27 Dec 2023 18:03:52 -0800 Subject: [PATCH 11/13] tox.ini (docker), build/bin/write-dockerfile.sh [DOCKER_BUILDKIT=1]: Save error status in a file --- build/bin/write-dockerfile.sh | 28 ++++++++++++++++++++-------- tox.ini | 32 +++++++++++++++++++------------- 2 files changed, 39 insertions(+), 21 deletions(-) diff --git a/build/bin/write-dockerfile.sh b/build/bin/write-dockerfile.sh index 2d0de123665..3c62d6082e4 100755 --- a/build/bin/write-dockerfile.sh +++ b/build/bin/write-dockerfile.sh @@ -214,6 +214,18 @@ EOF ;; esac esac + +case ${DOCKER_BUILDKIT-0} in + 1) + # With buildkit we cannot retrieve failed builds. + # So we do not allow the main step of a build stage to fail. + # Instead we record the exit code in the file STATUS. + THEN_SAVE_STATUS='; echo $? > STATUS' + # ... and at the beginning of the next build stage, + # we check the status and exit with an error status. + CHECK_STATUS_THEN='STATUS=$(cat STATUS 2>/dev/null); case "$STATUS" in ""|0) ;; *) exit $STATUS;; esac; ' +esac + cat < /dev/null" \ + docker: | (cd {envdir} && tar xf -); \ + docker: if [ -f {envdir}/sage/STATUS ]; then status=$(cat {envdir}/sage/STATUS); fi; \ + docker: fi; \ + docker: unset PUSH_TAGS; \ + docker: if [ -n "$BUILD_TAG" ]; then \ + docker: if [ $status != 0 ]; then \ + docker: BUILD_TAG="${BUILD_TAG%-failed}-failed"; PUSH_TAGS=$BUILD_IMAGE:$BUILD_TAG; \ + docker: else \ + docker: PUSH_TAGS=$(echo $BUILD_IMAGE:$BUILD_TAG; for tag in {env:EXTRA_DOCKER_TAGS:}; do echo "$BUILD_IMAGE:$tag"; done); \ + docker: fi; \ docker: echo $BUILD_IMAGE:$BUILD_TAG >> {envdir}/Dockertags; \ docker: fi; \ docker: if [ x"{env:DOCKER_PUSH_REPOSITORY:}" != x -a x"$PUSH_TAGS" != x ]; then \ @@ -787,15 +802,6 @@ commands = docker: if docker push $tag; then echo $tag >> {envdir}/Dockertags.pushed; else echo "(ignoring errors)"; fi; \ docker: done; \ docker: fi; \ - docker: if [ x"$BUILD_TAG" != x ]; then \ - docker: echo "Copying logs from the container to {envdir}/sage/"; \ - docker: docker run $BUILD_IMAGE:$BUILD_TAG bash -c " \ - docker: tar -c --ignore-failed-read -f - \ - docker: /sage/logs /sage/{prefix,venv}/var/lib/sage/installed \ - docker: ~/.sage/timings2.json /sage/pkgs/*/.tox/*/.sage/timings2.json \ - docker: /sage/pkgs/*/.tox/*/logs 2> /dev/null" \ - docker: | (cd {envdir} && tar xf -); \ - docker: fi; \ docker: if [ $status != 0 ]; then exit $status; fi; \ docker: done' # #28728: gap fails its test suite. From 415ecad8d459a95413afe4b24696ab429ef85910 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Wed, 27 Dec 2023 18:23:58 -0800 Subject: [PATCH 12/13] tox.ini (docker): Make DOCKER_BUILDKIT=1 the default --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 075c09f2d53..4dacdea4d5d 100644 --- a/tox.ini +++ b/tox.ini @@ -143,7 +143,7 @@ passenv = docker: EXTRA_DOCKER_BUILD_ARGS docker: EXTRA_DOCKER_TAGS docker: DOCKER_TAG - # Use DOCKER_BUILDKIT=1 for new version - for which unfortunately we cannot save failed builds as an image + # Use DOCKER_BUILDKIT=0 for legacy builder docker: DOCKER_BUILDKIT docker: BUILDKIT_INLINE_CACHE # Set for example to "with-system-packages configured with-targets-pre with-targets" @@ -756,7 +756,7 @@ commands = docker: BUILD_IMAGE=$DOCKER_PUSH_REPOSITORY$BUILD_IMAGE_STEM-$docker_target; \ docker: BUILD_TAG={env:DOCKER_TAG:$(git describe --dirty --always)}; \ docker: TAG_ARGS=$(for tag in $BUILD_TAG {env:EXTRA_DOCKER_TAGS:}; do echo --tag $BUILD_IMAGE:$tag; done); \ - docker: DOCKER_BUILDKIT={env:DOCKER_BUILDKIT:0}; \ + docker: DOCKER_BUILDKIT={env:DOCKER_BUILDKIT:1}; \ docker: docker build . -f {envdir}/Dockerfile \ docker: --target $docker_target \ docker: $TAG_ARGS \ From 78f9f2e84e64e1cb0e4f7ee2d112e158a6425401 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Wed, 27 Dec 2023 23:01:29 -0800 Subject: [PATCH 13/13] .github/workflows/docker.yml: Don't put tox venv in LOGS_ARTIFACT --- .github/workflows/docker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 9ea69233574..18910ca50a6 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -249,6 +249,7 @@ jobs: run: | mkdir -p "artifacts/$LOGS_ARTIFACT_NAME" cp -r .tox/$TOX_ENV/* "artifacts/$LOGS_ARTIFACT_NAME" + rm -rf "artifacts/$LOGS_ARTIFACT_NAME"/{bin,lib,pyvenv.cfg} if: always() - uses: actions/upload-artifact@v3 with: