From bf9b7f25db8e2cfca692435e2782b7c61a5cbada Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Wed, 27 Sep 2023 20:09:28 -0700 Subject: [PATCH 1/2] .github/workflows/ci-sage.yml: Add macOS --- .github/workflows/ci-sage.yml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-sage.yml b/.github/workflows/ci-sage.yml index 3a1bad47..b4566e56 100644 --- a/.github/workflows/ci-sage.yml +++ b/.github/workflows/ci-sage.yml @@ -1,9 +1,9 @@ -name: Run Sage CI for Linux +name: Run Sage CI for Linux and macOS ## This GitHub Actions workflow provides: ## ## - portability testing, by building and testing this project on many platforms -## (Linux variants) +## (Linux variants, macOS) ## ## - continuous integration, by building and testing other software ## that depends on this project. @@ -98,3 +98,16 @@ jobs: # 'Package "sage-docker-..." is already associated with another repository.' docker_push_repository: ghcr.io/${{ github.repository }}/scip_sdp_ needs: [dist] + + macos: + 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_PACKAGES="soplex,scipoptsuite,dsdp,scip_sdp" scip_sdp + sage_repo: sagemath/sage + sage_ref: develop + upstream_artifact: upstream + needs: [dist] From 0646833ea1b0857677bfbf1852a5f0838a6cdb48 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 4 Feb 2024 10:14:07 -0800 Subject: [PATCH 2/2] .github/workflows/ci-sage.yml (macos): Use https://github.com/sagemath/sage/pull/37237 --- .github/workflows/ci-sage.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci-sage.yml b/.github/workflows/ci-sage.yml index b4566e56..5a8ee9d6 100644 --- a/.github/workflows/ci-sage.yml +++ b/.github/workflows/ci-sage.yml @@ -100,14 +100,11 @@ jobs: needs: [dist] macos: - uses: sagemath/sage/.github/workflows/macos.yml@develop + # Use https://github.com/sagemath/sage/pull/37237 + uses: mkoeppe/sage/.github/workflows/macos.yml@ci-macos-2024 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_PACKAGES="soplex,scipoptsuite,dsdp,scip_sdp" scip_sdp sage_repo: sagemath/sage - sage_ref: develop + sage_ref: refs/pull/37237/head upstream_artifact: upstream needs: [dist]