From d63d6b3039f3e53846258e2c336059d41fda5f6a Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 27 Sep 2022 18:30:36 -0700 Subject: [PATCH 1/3] .github/workflows/ci-sage.yml: Use reusable workflow https://github.com/sagemath/sage/blob/develop/.github/workflows/docker.yml --- .github/workflows/ci-sage.yml | 95 +++++++---------------------------- 1 file changed, 18 insertions(+), 77 deletions(-) diff --git a/.github/workflows/ci-sage.yml b/.github/workflows/ci-sage.yml index 2a91934d2f..6937f4d67b 100644 --- a/.github/workflows/ci-sage.yml +++ b/.github/workflows/ci-sage.yml @@ -45,19 +45,6 @@ env: DIST_PREREQ: python3 # Name of this project in the Sage distribution SPKG: setuptools - # Sage distribution packages to build - TARGETS_PRE: build/make/Makefile - TARGETS: setuptools pyzmq - TARGETS_OPTIONAL: build/make/Makefile - # Standard setting: Test the current beta release of Sage: - SAGE_REPO: sagemath/sage - SAGE_REF: develop - # Test with the branch from https://trac.sagemath.org/ticket/33288 - # This may provide hotfixes for the CI that have not been merged into - # the sage develop branch yet. - SAGE_TRAC_GIT: https://github.com/sagemath/sagetrac-mirror.git - SAGE_TICKET: 33288 - REMOVE_PATCHES: "*" jobs: @@ -85,68 +72,22 @@ jobs: path: upstream name: upstream - docker: - runs-on: ubuntu-latest + linux: + # https://github.com/sagemath/sage/blob/develop/.github/workflows/docker.yml + uses: sagemath/sage/.github/workflows/docker.yml@develop + with: + # Sage distribution packages to build + targets: setuptools pyzmq + # Standard setting: Test the current beta release of Sage: + sage_repo: sagemath/sage + sage_ref: develop + upstream_artifact: upstream + sage_trac_git: https://github.com/sagemath/sagetrac-mirror.git + # Test with the branch from https://trac.sagemath.org/ticket/33288 + # This may provide hotfixes for the CI that have not been merged into + # the sage develop branch yet. + sage_trac_ticket: 33288 + # We prefix the image name with the SPKG name ("setuptools-") to avoid the error + # 'Package "sage-docker-..." is already associated with another repository.' + docker_push_repository: ghcr.io/${{ github.repository }}/setuptools- needs: [dist] - strategy: - fail-fast: false - max-parallel: 32 - matrix: - tox_system_factor: [ubuntu-trusty-toolchain-gcc_9, ubuntu-xenial-toolchain-gcc_9, ubuntu-bionic, ubuntu-focal, ubuntu-hirsute, ubuntu-impish, ubuntu-jammy, ubuntu-kinetic, debian-stretch, debian-buster, debian-bullseye, debian-bookworm, debian-sid, linuxmint-19, linuxmint-19.3, linuxmint-20.1, linuxmint-20.2, linuxmint-20.3, linuxmint-21, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, fedora-35, fedora-36, fedora-37, centos-7-devtoolset-gcc_11, centos-stream-8, gentoo-python3.9, gentoo-python3.10, archlinux-latest, opensuse-15.3, opensuse-tumbleweed, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-i386-devtoolset-gcc_11] - tox_packages_factor: [minimal, standard] - env: - TOX_ENV: docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }} - LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }} - DOCKER_TARGETS: configured with-targets with-targets-optional - steps: - - name: Check out SageMath - uses: actions/checkout@v2 - with: - repository: ${{ env.SAGE_REPO }} - ref: ${{ env.SAGE_REF }} - fetch-depth: 2000 - if: env.SAGE_REPO != '' - - name: Check out git-trac-command - uses: actions/checkout@v2 - with: - repository: sagemath/git-trac-command - path: git-trac-command - if: env.SAGE_TRAC_GIT != '' - - name: Check out SageMath from trac.sagemath.org - shell: bash {0} - run: | - git config --global user.email "ci-sage@example.com" - git config --global user.name "ci-sage workflow" - if [ ! -d .git ]; then git init; fi; git remote add trac ${{ env.SAGE_TRAC_GIT }} && x=1 && while [ $x -le 5 ]; do x=$(( $x + 1 )); sleep $(( $RANDOM % 60 + 1 )); if git-trac-command/git-trac fetch $SAGE_TICKET; then git merge FETCH_HEAD || echo "(ignored)"; exit 0; fi; sleep 40; done; exit 1 - if: env.SAGE_TRAC_GIT != '' - - uses: actions/download-artifact@v2 - with: - path: upstream - name: upstream - - name: Install test prerequisites - run: | - sudo DEBIAN_FRONTEND=noninteractive apt-get update - sudo DEBIAN_FRONTEND=noninteractive apt-get install tox python3-setuptools - - name: Update Sage packages from upstream artifact - run: | - (export PATH=$(pwd)/build/bin:$PATH; (cd upstream && bash -x update-pkgs.sh) && sed -i.bak '/upstream/d' .dockerignore && echo "/:toolchain:/i ADD upstream upstream" | sed -i.bak -f - build/bin/write-dockerfile.sh && git diff) - - name: Configure and build Sage distribution within a Docker container - run: | - set -o pipefail; EXTRA_DOCKER_BUILD_ARGS="--build-arg USE_MAKEFLAGS=\"-k V=0 SAGE_NUM_THREADS=3\"" tox -e $TOX_ENV -- $TARGETS 2>&1 | sed "/^configure: notice:/s|^|::warning file=artifacts/$LOGS_ARTIFACT_NAME/config.log::|;/^configure: warning:/s|^|::warning file=artifacts/$LOGS_ARTIFACT_NAME/config.log::|;/^configure: error:/s|^|::error file=artifacts/$LOGS_ARTIFACT_NAME/config.log::|;" - - 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 - if: always() - - uses: actions/upload-artifact@v2 - with: - path: artifacts - name: ${{ env.LOGS_ARTIFACT_NAME }} - if: always() - - name: Print out logs for immediate inspection - # and markup the output with GitHub Actions logging commands - run: | - .github/workflows/scan-logs.sh "artifacts/$LOGS_ARTIFACT_NAME" - if: always() From f60bb5af757e42401fc3b85422f2f49e8b3dd443 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 27 Sep 2022 18:31:07 -0700 Subject: [PATCH 2/3] .github/workflows/ci-sage.yml: Run on pull_request when the yml file is modified --- .github/workflows/ci-sage.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci-sage.yml b/.github/workflows/ci-sage.yml index 6937f4d67b..072d89d711 100644 --- a/.github/workflows/ci-sage.yml +++ b/.github/workflows/ci-sage.yml @@ -37,6 +37,9 @@ on: push: tags: - '*' + pull_request: + paths: + - .github/workflows/ci-sage.yml workflow_dispatch: # Allow to run manually From a4a9d1c847b93170cfe7f7f6d72645f6b0c71ad0 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 27 Sep 2022 18:46:46 -0700 Subject: [PATCH 3/3] .github/workflows/ci-sage.yml: Use reusable workflow from https://trac.sagemath.org/ticket/33288 --- .github/workflows/ci-sage.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-sage.yml b/.github/workflows/ci-sage.yml index 072d89d711..f3fe8513b9 100644 --- a/.github/workflows/ci-sage.yml +++ b/.github/workflows/ci-sage.yml @@ -77,7 +77,8 @@ jobs: linux: # https://github.com/sagemath/sage/blob/develop/.github/workflows/docker.yml - uses: sagemath/sage/.github/workflows/docker.yml@develop + # Use branch of ticket https://trac.sagemath.org/ticket/33288 + uses: sagemath/sagetrac-mirror/.github/workflows/docker.yml@u/mkoeppe/setuptools_ci_target with: # Sage distribution packages to build targets: setuptools pyzmq