From af64122ec8aa46deb1d7b1a79fe4dc28d0e661e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Albin=20Ahlb=C3=A4ck?= Date: Thu, 24 Jul 2025 22:45:12 +0200 Subject: [PATCH 1/9] Add FLINT_NORETURN to function pointer argument In flint_set_abort and flint_set_throw --- src/generic_files/exception.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/generic_files/exception.c b/src/generic_files/exception.c index 42c02a3a20..62aead1487 100644 --- a/src/generic_files/exception.c +++ b/src/generic_files/exception.c @@ -44,37 +44,25 @@ void __flint_set_throw_init(void) FLINT_NORETURN void (* abort_func)(void) = abort; FLINT_NORETURN void (* throw_func)(flint_err_t, const char *, va_list) = __flint_throw; -void flint_set_abort(void (* func)(void)) +void flint_set_abort(void (* func)(void) FLINT_NORETURN) { #if FLINT_REENTRANT && !FLINT_USES_TLS && FLINT_USES_PTHREAD pthread_once(&abort_func_init, __flint_set_abort_init); pthread_mutex_lock(&abort_func_lock); #endif - -DIAGNOSTIC_PUSH -DIAGNOSTIC_IGNORE_INCOMPATIBLE_FUNCTION_POINTER_TYPES -DIAGNOSTIC_IGNORE_DISCARDED_QUALIFIERS abort_func = func; -DIAGNOSTIC_POP - #if FLINT_REENTRANT && !FLINT_USES_TLS && FLINT_USES_PTHREAD pthread_mutex_unlock(&abort_func_lock); #endif } -void flint_set_throw(void (* func)(flint_err_t, const char *, va_list)) +void flint_set_throw(void (* func)(flint_err_t, const char *, va_list) FLINT_NORETURN) { #if FLINT_REENTRANT && !FLINT_USES_TLS && FLINT_USES_PTHREAD pthread_once(&throw_func_init, __flint_set_throw_init); pthread_mutex_lock(&throw_func_lock); #endif - -DIAGNOSTIC_PUSH -DIAGNOSTIC_IGNORE_INCOMPATIBLE_FUNCTION_POINTER_TYPES -DIAGNOSTIC_IGNORE_DISCARDED_QUALIFIERS throw_func = func; -DIAGNOSTIC_POP - #if FLINT_REENTRANT && !FLINT_USES_TLS && FLINT_USES_PTHREAD pthread_mutex_unlock(&throw_func_lock); #endif From 2e8cbcbafcaf85b592cff742ddde24a61dd8fa29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Albin=20Ahlb=C3=A4ck?= Date: Fri, 25 Jul 2025 00:48:37 +0200 Subject: [PATCH 2/9] Ugly compiler workaround --- src/generic_files/exception.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/generic_files/exception.c b/src/generic_files/exception.c index 62aead1487..6dd498ce52 100644 --- a/src/generic_files/exception.c +++ b/src/generic_files/exception.c @@ -12,7 +12,11 @@ #include #include #include +#define flint_set_abort gurkmacka +#define flint_set_throw cclusi #include "flint.h" +#undef flint_set_abort +#undef flint_set_throw #undef FLINT_NORETURN #if defined(__GNUC__) From 8d5e85bb32df668ed94fadc9b78850d2e772164f Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 2 Jul 2022 11:22:02 -0700 Subject: [PATCH 3/9] .github/workflows/ci-sage.yml: New --- .github/workflows/ci-sage.yml | 258 ++++++++++++++++++++++++++++++++++ 1 file changed, 258 insertions(+) create mode 100644 .github/workflows/ci-sage.yml diff --git a/.github/workflows/ci-sage.yml b/.github/workflows/ci-sage.yml new file mode 100644 index 0000000000..49e5fe8d9f --- /dev/null +++ b/.github/workflows/ci-sage.yml @@ -0,0 +1,258 @@ +name: Run Sage CI for Linux/Cygwin/macOS + +## This GitHub Actions workflow provides: +## +## - portability testing, by building and testing this project on many platforms +## (Linux variants and Cygwin), each with two configurations (installed packages), +## +## - continuous integration, by building and testing other software +## that depends on this project. +## +## It runs on every pull request and push of a tag to the GitHub repository. +## +## The testing can be monitored in the "Actions" tab of the GitHub repository. +## +## After all jobs have finished (or are canceled) and a short delay, +## tar files of all logs are made available as "build artifacts". +## +## This GitHub Actions workflow uses the portability testing framework +## of SageMath (https://www.sagemath.org/). For more information, see +## https://doc.sagemath.org/html/en/developer/portability_testing.html + +## The workflow consists of two jobs: +## +## - First, it builds a source distribution of the project +## and generates a script "update-pkgs.sh". It uploads them +## as a build artifact named upstream. +## +## - Second, it checks out a copy of the SageMath source tree. +## It downloads the upstream artifact and replaces the project's +## package in the SageMath distribution by the newly packaged one +## from the upstream artifact, by running the script "update-pkgs.sh". +## Then it builds a small portion of the Sage distribution. +## +## Many copies of the second step are run in parallel for each of the tested +## systems/configurations. + +#on: [push, pull_request] + +on: + pull_request: + types: [opened, synchronize] + push: + tags: + - '*' + +env: + # Ubuntu packages to install so that the project's "make dist" can succeed + DIST_PREREQ: + # Name of this project in the Sage distribution + SPKG: flint + # Sage distribution packages to build + TARGETS_PRE: build/make/Makefile + TARGETS: SAGE_CHECK=yes flint + TARGETS_OPTIONAL: SAGE_CHECK=warn arb + # Standard setting: Test the current beta release of Sage: + SAGE_REPO: sagemath/sage + SAGE_REF: develop + # Temporarily test on the branch from sage ticket https://trac.sagemath.org/ticket/34102 + # FLINT 2.9 upgrade ticket; this is a no-op when merged in Sage develop. + SAGE_TRAC_GIT: https://github.com/sagemath/sagetrac-mirror.git + SAGE_TICKET: 34102 + #REMOVE_PATCHES: "*" + +jobs: + + dist: + runs-on: ubuntu-latest + steps: + - name: Check out ${{ env.SPKG }} + uses: actions/checkout@v2 + with: + path: build/pkgs/${{ env.SPKG }}/src + - name: Install prerequisites + run: | + sudo DEBIAN_FRONTEND=noninteractive apt-get update + sudo DEBIAN_FRONTEND=noninteractive apt-get install $DIST_PREREQ + if: env.DIST_PREREQ != '' + - name: Run make dist, prepare upstream artifact + run: | + (cd build/pkgs/${{ env.SPKG }}/src && (cd .. && tar czf - src) > arb-git.tar.gz) \ + && mkdir -p upstream && cp build/pkgs/${{ env.SPKG }}/src/*.tar.gz upstream/${{ env.SPKG }}-git.tar.gz \ + && echo "sage-package create ${{ env.SPKG }} --version git --tarball ${{ env.SPKG }}-git.tar.gz --type=optional" > upstream/update-pkgs.sh \ + && if [ -n "${{ env.REMOVE_PATCHES }}" ]; then echo "(cd ../build/pkgs/${{ env.SPKG }}/patches && rm -f ${{ env.REMOVE_PATCHES }}; :)" >> upstream/update-pkgs.sh; fi \ + && ls -l upstream/ + - uses: actions/upload-artifact@v2 + with: + path: upstream + name: upstream + + cygwin: + uses: sagemath/sagetrac-mirror/.github/workflows/cygwin.yml@u/mkoeppe/ci_cygwin__refactor_using_reusable_workflows + with: + # FIXME: duplicated from env.TARGETS + targets: SAGE_CHECK=yes flint + prefix: /opt/sage-flint + sage_repo: sagemath/sage + sage_ref: develop + upstream_artifact: upstream + sage_trac_git: https://github.com/sagemath/sagetrac-mirror.git + sage_trac_ticket: 34102 + needs: [dist] + + docker: + runs-on: ubuntu-latest + 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, raspbian-buster-armhf] + 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() + - name: Push Docker images + run: | + if [ -f .tox/$TOX_ENV/Dockertags ]; then + TOKEN="${{ secrets.DOCKER_PKG_GITHUB_TOKEN }}" + if [ -z "$TOKEN" ]; then + TOKEN="${{ secrets.GITHUB_TOKEN }}" + fi + echo "$TOKEN" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin + for a in $(cat .tox/$TOX_ENV/Dockertags); do + FULL_TAG=docker.pkg.github.com/$(echo ${{ github.repository }}|tr 'A-Z' 'a-z')/$a + docker tag $a $FULL_TAG + echo Pushing $FULL_TAG + docker push $FULL_TAG + done || echo "(Ignoring errors)" + fi + if: always() + + macos: + + runs-on: macos-latest + strategy: + fail-fast: false + max-parallel: 4 + matrix: + os: [ macos-10.15, macos-11.0 ] + tox_system_factor: [homebrew-macos, homebrew-macos-python3_xcode, homebrew-macos-python3_xcode-nokegonly, conda-forge-macos] + tox_packages_factor: [minimal, standard] + xcode_version_factor: [11.7, default, 12.3] + + needs: [dist] + + env: + TOX_ENV: local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }} + LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}-${{ matrix.os }}-xcode_${{ matrix.xcode_version_factor }} + DOCKER_TARGETS: configured with-targets with-targets-optional + + steps: + + - name: Select Xcode version + run: | + if [ ${{ matrix.xcode_version_factor }} != default ]; then sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode_version_factor }}.app; fi + - 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: Update Sage packages from upstream artifact + run: | + (export PATH=$(pwd)/build/bin:$PATH; (cd upstream && bash -x update-pkgs.sh) && git diff) + + - name: Install test prerequisites + run: | + brew install tox + - name: Build and test with tox + # We use a high parallelization on purpose in order to catch possible parallelization bugs in the build scripts. + # For doctesting, we use a lower parallelization to avoid timeouts. + run: | + MAKE="make -j12" tox -e $TOX_ENV -- SAGE_NUM_THREADS=4 $TARGETS + - name: Prepare logs artifact + run: | + mkdir -p "artifacts/$LOGS_ARTIFACT_NAME"; cp -r .tox/*/log "artifacts/$LOGS_ARTIFACT_NAME" + if: always() + - uses: actions/upload-artifact@v1 + 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 480b2b73c95fd0bf729a17ca4188c722b6b177e0 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 2 Jul 2022 12:37:48 -0700 Subject: [PATCH 4/9] .github/workflows/ci-sage.yml: Merge with version from release branch --- .github/workflows/ci-sage.yml | 45 ++++++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-sage.yml b/.github/workflows/ci-sage.yml index 49e5fe8d9f..487bd9f6a0 100644 --- a/.github/workflows/ci-sage.yml +++ b/.github/workflows/ci-sage.yml @@ -42,10 +42,12 @@ on: push: tags: - '*' + workflow_dispatch: + # Allow to run manually env: # Ubuntu packages to install so that the project's "make dist" can succeed - DIST_PREREQ: + DIST_PREREQ: tar # Name of this project in the Sage distribution SPKG: flint # Sage distribution packages to build @@ -63,8 +65,44 @@ env: jobs: + ubuntu-gcc: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: | + sudo apt-get install texinfo + ./.build_dependencies + ./configure CFLAGS="-Wredundant-decls" --with-mpir=${LOCAL} --with-mpfr=${LOCAL} --prefix=${LOCAL} + $MAKE + ldd libflint.so + $MAKE check + env: + LOCAL: ${{ github.workspace }}/local + LDFLAGS: "-Wl,-rpath,$LOCAL/lib" + MAKE: "make -j" + + ubuntu-cmake-gcc: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: | + sudo apt-get install texinfo + sudo apt-get install cmake + ./.build_dependencies + mkdir build + cd build + cmake -G"Unix Makefiles" -DWITH_NTL=no -DBUILD_TESTING=yes -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=$LOCAL .. + $MAKE + ldd lib/libflint.so + env: + LOCAL: ${{ github.workspace }}/local + LDFLAGS: "-Wl,-rpath,$LOCAL/lib" + MAKE: "make -j" + dist: runs-on: ubuntu-latest + needs: [ubuntu-gcc, ubuntu-cmake-gcc] + steps: - name: Check out ${{ env.SPKG }} uses: actions/checkout@v2 @@ -76,10 +114,11 @@ jobs: sudo DEBIAN_FRONTEND=noninteractive apt-get install $DIST_PREREQ if: env.DIST_PREREQ != '' - name: Run make dist, prepare upstream artifact + # FLINT's "make dist" is upstream-centric: it hard-codes repo tags; cannot use run: | - (cd build/pkgs/${{ env.SPKG }}/src && (cd .. && tar czf - src) > arb-git.tar.gz) \ + (cd build/pkgs/${{ env.SPKG }}/src && ./configure && git archive --format tar --prefix flint-git/ HEAD | gzip > ${{ env.SPKG }}-git.tar.gz ) \ && mkdir -p upstream && cp build/pkgs/${{ env.SPKG }}/src/*.tar.gz upstream/${{ env.SPKG }}-git.tar.gz \ - && echo "sage-package create ${{ env.SPKG }} --version git --tarball ${{ env.SPKG }}-git.tar.gz --type=optional" > upstream/update-pkgs.sh \ + && echo "sage-package create ${{ env.SPKG }} --version git --tarball ${{ env.SPKG }}-git.tar.gz --type=standard" > upstream/update-pkgs.sh \ && if [ -n "${{ env.REMOVE_PATCHES }}" ]; then echo "(cd ../build/pkgs/${{ env.SPKG }}/patches && rm -f ${{ env.REMOVE_PATCHES }}; :)" >> upstream/update-pkgs.sh; fi \ && ls -l upstream/ - uses: actions/upload-artifact@v2 From c575978ea13e5392b280c4076baceb4848301966 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 30 Jan 2024 15:16:15 -0800 Subject: [PATCH 5/9] .github/workflows/ci-sage.yml: Update using reusable workflows --- .github/workflows/ci-sage.yml | 265 +++++++--------------------------- 1 file changed, 49 insertions(+), 216 deletions(-) diff --git a/.github/workflows/ci-sage.yml b/.github/workflows/ci-sage.yml index 487bd9f6a0..7da0c1d2a3 100644 --- a/.github/workflows/ci-sage.yml +++ b/.github/workflows/ci-sage.yml @@ -1,4 +1,4 @@ -name: Run Sage CI for Linux/Cygwin/macOS +name: Run Sage CI ## This GitHub Actions workflow provides: ## @@ -34,11 +34,7 @@ name: Run Sage CI for Linux/Cygwin/macOS ## Many copies of the second step are run in parallel for each of the tested ## systems/configurations. -#on: [push, pull_request] - on: - pull_request: - types: [opened, synchronize] push: tags: - '*' @@ -47,62 +43,18 @@ on: env: # Ubuntu packages to install so that the project's "make dist" can succeed - DIST_PREREQ: tar + DIST_PREREQ: tar libgmp-dev libmpfr-dev # Name of this project in the Sage distribution - SPKG: flint - # Sage distribution packages to build - TARGETS_PRE: build/make/Makefile - TARGETS: SAGE_CHECK=yes flint - TARGETS_OPTIONAL: SAGE_CHECK=warn arb + SPKG: flint # Standard setting: Test the current beta release of Sage: - SAGE_REPO: sagemath/sage - SAGE_REF: develop - # Temporarily test on the branch from sage ticket https://trac.sagemath.org/ticket/34102 - # FLINT 2.9 upgrade ticket; this is a no-op when merged in Sage develop. - SAGE_TRAC_GIT: https://github.com/sagemath/sagetrac-mirror.git - SAGE_TICKET: 34102 - #REMOVE_PATCHES: "*" + SAGE_REPO: sagemath/sage + SAGE_REF: develop + REMOVE_PATCHES: "*" jobs: - ubuntu-gcc: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - run: | - sudo apt-get install texinfo - ./.build_dependencies - ./configure CFLAGS="-Wredundant-decls" --with-mpir=${LOCAL} --with-mpfr=${LOCAL} --prefix=${LOCAL} - $MAKE - ldd libflint.so - $MAKE check - env: - LOCAL: ${{ github.workspace }}/local - LDFLAGS: "-Wl,-rpath,$LOCAL/lib" - MAKE: "make -j" - - ubuntu-cmake-gcc: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - run: | - sudo apt-get install texinfo - sudo apt-get install cmake - ./.build_dependencies - mkdir build - cd build - cmake -G"Unix Makefiles" -DWITH_NTL=no -DBUILD_TESTING=yes -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=$LOCAL .. - $MAKE - ldd lib/libflint.so - env: - LOCAL: ${{ github.workspace }}/local - LDFLAGS: "-Wl,-rpath,$LOCAL/lib" - MAKE: "make -j" - dist: runs-on: ubuntu-latest - needs: [ubuntu-gcc, ubuntu-cmake-gcc] - steps: - name: Check out ${{ env.SPKG }} uses: actions/checkout@v2 @@ -114,9 +66,8 @@ jobs: sudo DEBIAN_FRONTEND=noninteractive apt-get install $DIST_PREREQ if: env.DIST_PREREQ != '' - name: Run make dist, prepare upstream artifact - # FLINT's "make dist" is upstream-centric: it hard-codes repo tags; cannot use run: | - (cd build/pkgs/${{ env.SPKG }}/src && ./configure && git archive --format tar --prefix flint-git/ HEAD | gzip > ${{ env.SPKG }}-git.tar.gz ) \ + (cd build/pkgs/${{ env.SPKG }}/src && ./bootstrap.sh && ./configure && make dist) \ && mkdir -p upstream && cp build/pkgs/${{ env.SPKG }}/src/*.tar.gz upstream/${{ env.SPKG }}-git.tar.gz \ && echo "sage-package create ${{ env.SPKG }} --version git --tarball ${{ env.SPKG }}-git.tar.gz --type=standard" > upstream/update-pkgs.sh \ && if [ -n "${{ env.REMOVE_PATCHES }}" ]; then echo "(cd ../build/pkgs/${{ env.SPKG }}/patches && rm -f ${{ env.REMOVE_PATCHES }}; :)" >> upstream/update-pkgs.sh; fi \ @@ -126,172 +77,54 @@ jobs: path: upstream name: upstream - cygwin: - uses: sagemath/sagetrac-mirror/.github/workflows/cygwin.yml@u/mkoeppe/ci_cygwin__refactor_using_reusable_workflows + linux: + uses: sagemath/sage/.github/workflows/docker.yml@develop with: - # FIXME: duplicated from env.TARGETS - targets: SAGE_CHECK=yes flint - prefix: /opt/sage-flint + # Sage distribution packages to build + targets: SAGE_CHECK=no SAGE_CHECK_flint=yes flint + # 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 - sage_trac_ticket: 34102 + # Docker targets (stages) to tag + docker_targets: "with-targets" + # We prefix the image name with the SPKG name ("flint_") to avoid the error + # 'Package "sage-docker-..." is already associated with another repository.' + docker_push_repository: ghcr.io/${{ github.repository }}/flint_ needs: [dist] - docker: - runs-on: ubuntu-latest - 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, raspbian-buster-armhf] - 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() - - name: Push Docker images - run: | - if [ -f .tox/$TOX_ENV/Dockertags ]; then - TOKEN="${{ secrets.DOCKER_PKG_GITHUB_TOKEN }}" - if [ -z "$TOKEN" ]; then - TOKEN="${{ secrets.GITHUB_TOKEN }}" - fi - echo "$TOKEN" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin - for a in $(cat .tox/$TOX_ENV/Dockertags); do - FULL_TAG=docker.pkg.github.com/$(echo ${{ github.repository }}|tr 'A-Z' 'a-z')/$a - docker tag $a $FULL_TAG - echo Pushing $FULL_TAG - docker push $FULL_TAG - done || echo "(Ignoring errors)" - fi - if: always() - macos: - - runs-on: macos-latest - strategy: - fail-fast: false - max-parallel: 4 - matrix: - os: [ macos-10.15, macos-11.0 ] - tox_system_factor: [homebrew-macos, homebrew-macos-python3_xcode, homebrew-macos-python3_xcode-nokegonly, conda-forge-macos] - tox_packages_factor: [minimal, standard] - xcode_version_factor: [11.7, default, 12.3] - + uses: sagemath/sage/.github/workflows/macos.yml@develop + with: + osversion_xcodeversion_toxenv_tuples: >- + [["latest", "", "homebrew-macos-usrlocal-minimal"], + ["latest", "", "homebrew-macos-usrlocal-standard"], + ["13", "xcode_15.0", "homebrew-macos-usrlocal-standard"]] + targets: SAGE_CHECK=no SAGE_CHECK_flint=yes flint + # Standard setting: Test the current beta release of Sage: + sage_repo: sagemath/sage + sage_ref: develop + upstream_artifact: upstream needs: [dist] - env: - TOX_ENV: local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }} - LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}-${{ matrix.os }}-xcode_${{ matrix.xcode_version_factor }} - DOCKER_TARGETS: configured with-targets with-targets-optional - - steps: - - - name: Select Xcode version - run: | - if [ ${{ matrix.xcode_version_factor }} != default ]; then sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode_version_factor }}.app; fi - - 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: Update Sage packages from upstream artifact - run: | - (export PATH=$(pwd)/build/bin:$PATH; (cd upstream && bash -x update-pkgs.sh) && git diff) - - - name: Install test prerequisites - run: | - brew install tox - - name: Build and test with tox - # We use a high parallelization on purpose in order to catch possible parallelization bugs in the build scripts. - # For doctesting, we use a lower parallelization to avoid timeouts. - run: | - MAKE="make -j12" tox -e $TOX_ENV -- SAGE_NUM_THREADS=4 $TARGETS - - name: Prepare logs artifact - run: | - mkdir -p "artifacts/$LOGS_ARTIFACT_NAME"; cp -r .tox/*/log "artifacts/$LOGS_ARTIFACT_NAME" - if: always() - - uses: actions/upload-artifact@v1 - 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() + sage: + uses: sagemath/sage/.github/workflows/docker.yml@develop + with: + # Standard setting: Test the current beta release of Sage: + sage_repo: sagemath/sage + sage_ref: develop + upstream_artifact: upstream + # Build incrementally from published Docker image + incremental: true + free_disk_space: true + from_docker_repository: ghcr.io/sagemath/sage/ + from_docker_target: "with-targets" + from_docker_tag: "dev" + docker_targets: "with-targets" + targets: "build ptest-nodoc" + tox_system_factors: >- + ["debian-bookworm"] + tox_packages_factors: >- + ["standard"] + docker_push_repository: ghcr.io/${{ github.repository }}/flint_ + needs: [dist] From 3b59192eaec590ffaf6a007e18b79f11bc74479c Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 30 Jan 2024 17:32:49 -0800 Subject: [PATCH 6/9] .github/workflows/ci-sage.yml: Run weekly --- .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 7da0c1d2a3..99f9a25b84 100644 --- a/.github/workflows/ci-sage.yml +++ b/.github/workflows/ci-sage.yml @@ -38,6 +38,9 @@ on: push: tags: - '*' + schedule: + # run each Tuesday at 01:00 + - cron: '0 1 * * 2' workflow_dispatch: # Allow to run manually From ee6d7ae46835b52f32a027d506d704c7acf23edc Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 30 Jan 2024 17:42:59 -0800 Subject: [PATCH 7/9] .github/workflows/ci-sage.yml: Remove broken macOS configuration --- .github/workflows/ci-sage.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci-sage.yml b/.github/workflows/ci-sage.yml index 99f9a25b84..2ada21982a 100644 --- a/.github/workflows/ci-sage.yml +++ b/.github/workflows/ci-sage.yml @@ -101,8 +101,7 @@ jobs: with: osversion_xcodeversion_toxenv_tuples: >- [["latest", "", "homebrew-macos-usrlocal-minimal"], - ["latest", "", "homebrew-macos-usrlocal-standard"], - ["13", "xcode_15.0", "homebrew-macos-usrlocal-standard"]] + ["latest", "", "homebrew-macos-usrlocal-standard"]] targets: SAGE_CHECK=no SAGE_CHECK_flint=yes flint # Standard setting: Test the current beta release of Sage: sage_repo: sagemath/sage From 83a20f85ea21f1ab422a7eb33b994c294b40ffae Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 25 Feb 2024 13:48:56 -0800 Subject: [PATCH 8/9] .github/workflows/ci-sage.yml (sage): Add msolve --- .github/workflows/ci-sage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-sage.yml b/.github/workflows/ci-sage.yml index 2ada21982a..fce59ed8e6 100644 --- a/.github/workflows/ci-sage.yml +++ b/.github/workflows/ci-sage.yml @@ -123,7 +123,7 @@ jobs: from_docker_target: "with-targets" from_docker_tag: "dev" docker_targets: "with-targets" - targets: "build ptest-nodoc" + targets: "build msolve ptest-nodoc" tox_system_factors: >- ["debian-bookworm"] tox_packages_factors: >- From d95b302a6e6a3908e19b77b2078905cd2404f1ba Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 24 Jul 2025 13:28:27 -0700 Subject: [PATCH 9/9] .github/workflows/ci-sage.yml: Switch to passagemath, add mingw, update --- .github/workflows/ci-sage.yml | 54 ++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 23 deletions(-) diff --git a/.github/workflows/ci-sage.yml b/.github/workflows/ci-sage.yml index fce59ed8e6..b7ac4824f0 100644 --- a/.github/workflows/ci-sage.yml +++ b/.github/workflows/ci-sage.yml @@ -3,7 +3,7 @@ name: Run Sage CI ## This GitHub Actions workflow provides: ## ## - portability testing, by building and testing this project on many platforms -## (Linux variants and Cygwin), each with two configurations (installed packages), +## (Linux variants, macOS, Windows with mingw32), each with two configurations (installed packages), ## ## - continuous integration, by building and testing other software ## that depends on this project. @@ -49,9 +49,6 @@ env: DIST_PREREQ: tar libgmp-dev libmpfr-dev # Name of this project in the Sage distribution SPKG: flint - # Standard setting: Test the current beta release of Sage: - SAGE_REPO: sagemath/sage - SAGE_REF: develop REMOVE_PATCHES: "*" jobs: @@ -60,7 +57,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out ${{ env.SPKG }} - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: build/pkgs/${{ env.SPKG }}/src - name: Install prerequisites @@ -75,19 +72,19 @@ jobs: && echo "sage-package create ${{ env.SPKG }} --version git --tarball ${{ env.SPKG }}-git.tar.gz --type=standard" > upstream/update-pkgs.sh \ && if [ -n "${{ env.REMOVE_PATCHES }}" ]; then echo "(cd ../build/pkgs/${{ env.SPKG }}/patches && rm -f ${{ env.REMOVE_PATCHES }}; :)" >> upstream/update-pkgs.sh; fi \ && ls -l upstream/ - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: path: upstream name: upstream linux: - uses: sagemath/sage/.github/workflows/docker.yml@develop + uses: passagemath/passagemath/.github/workflows/docker.yml@main with: # Sage distribution packages to build targets: SAGE_CHECK=no SAGE_CHECK_flint=yes flint - # Standard setting: Test the current beta release of Sage: - sage_repo: sagemath/sage - sage_ref: develop + # Standard setting: Test the current HEAD of passagemath: + sage_repo: passagemath/passagemath + sage_ref: main upstream_artifact: upstream # Docker targets (stages) to tag docker_targets: "with-targets" @@ -97,33 +94,44 @@ jobs: needs: [dist] macos: - uses: sagemath/sage/.github/workflows/macos.yml@develop + uses: passagemath/passagemath/.github/workflows/macos.yml@main with: - osversion_xcodeversion_toxenv_tuples: >- - [["latest", "", "homebrew-macos-usrlocal-minimal"], - ["latest", "", "homebrew-macos-usrlocal-standard"]] targets: SAGE_CHECK=no SAGE_CHECK_flint=yes flint - # Standard setting: Test the current beta release of Sage: - sage_repo: sagemath/sage - sage_ref: develop + # Standard setting: Test the current HEAD of passagemath: + sage_repo: passagemath/passagemath + sage_ref: main + upstream_artifact: upstream + needs: [dist] + + mingw: + uses: passagemath/passagemath/.github/workflows/mingw.yml@main + with: + # Extra system packages to install. See available packages at + # https://github.com/passagemath/passagemath/tree/main/build/pkgs + extra_sage_packages: "info" + # Sage distribution packages to build + targets: SAGE_CHECK=no SAGE_CHECK_flint=yes flint + # Standard setting: Test the current HEAD of passagemath: + sage_repo: passagemath/passagemath + sage_ref: main upstream_artifact: upstream needs: [dist] sage: - uses: sagemath/sage/.github/workflows/docker.yml@develop + uses: passagemath/passagemath/.github/workflows/docker.yml@main with: - # Standard setting: Test the current beta release of Sage: - sage_repo: sagemath/sage - sage_ref: develop + # Standard setting: Test the current HEAD of passagemath: + sage_repo: passagemath/passagemath + sage_ref: main upstream_artifact: upstream # Build incrementally from published Docker image incremental: true free_disk_space: true - from_docker_repository: ghcr.io/sagemath/sage/ + from_docker_repository: ghcr.io/passagemath/passagemath/ from_docker_target: "with-targets" from_docker_tag: "dev" docker_targets: "with-targets" - targets: "build msolve ptest-nodoc" + targets: "SAGE_CHECK_passagemath_flint=yes sagemath_flint msolve" tox_system_factors: >- ["debian-bookworm"] tox_packages_factors: >-