Skip to content

Commit

Permalink
.github/workflows/ci-sage.yml: Use sagemath/sage#36338 for linux
Browse files Browse the repository at this point in the history
  • Loading branch information
Matthias Koeppe committed Sep 26, 2023
1 parent 32fbfec commit 3f6de6c
Showing 1 changed file with 11 additions and 7 deletions.
18 changes: 11 additions & 7 deletions .github/workflows/ci-sage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,15 +151,17 @@ jobs:
make -j4 check-all
make -j4 distcheck
docker:
uses: sagemath/sage/.github/workflows/docker.yml@develop
linux:
uses: mkoeppe/sage/.github/workflows/docker.yml@tox_2023_09
with:
# FIXME: duplicated from env.TARGETS
targets_pre: build/make/Makefile
targets: SAGE_CHECK=no SAGE_CHECK_PACKAGES="cysignals,cypari" cysignals cypari
targets_optional: build/make/Makefile
sage_repo: sagemath/sage
sage_ref: develop
sage_repo: mkoeppe/sage
sage_ref: tox_2023_09
#sage_repo: sagemath/sage
#sage_ref: develop
upstream_artifact: upstream
# We prefix the image name with the SPKG name ("cysignals-") to avoid the error
# 'Package "sage-docker-..." is already associated with another repository.'
Expand Down Expand Up @@ -205,13 +207,15 @@ jobs:
osversion_xcodeversion_toxenv_tuples: >-
[["latest", "", "homebrew-macos-usrlocal-minimal"],
["latest", "", "homebrew-macos-usrlocal-standard"],
["13", "xcode_15.0", ""homebrew-macos-usrlocal-standard"],
["13", "xcode_15.0", "homebrew-macos-usrlocal-standard"],
["latest", "", "conda-forge-macos-standard"]]
# FIXME: duplicated from env.TARGETS
targets_pre: build/make/Makefile
targets: SAGE_CHECK=no SAGE_CHECK_PACKAGES="cysignals,cypari" cysignals cypari
targets_optional: build/make/Makefile
sage_repo: sagemath/sage
sage_ref: refs/pull/36110/merge
sage_repo: mkoeppe/sage
sage_ref: tox_2023_09
#sage_repo: sagemath/sage
#sage_ref: refs/pull/36110/merge
upstream_artifact: upstream
needs: [dist, macos-without-sage]

0 comments on commit 3f6de6c

Please sign in to comment.