Skip to content

Commit 3233673

Browse files
authored
Merge pull request #187 from tobiasdiez/fix-ci
Fix CI
2 parents 058cd28 + 84a7b01 commit 3233673

File tree

1 file changed

+5
-39
lines changed

1 file changed

+5
-39
lines changed

.github/workflows/main.yml

Lines changed: 5 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ name: cypari2
22

33
on:
44
pull_request:
5-
types: [opened, synchronize]
65
push:
76
tags:
87
- '*'
@@ -21,8 +20,8 @@ jobs:
2120
fail-fast: false
2221
matrix:
2322
os: [ubuntu-latest]
24-
python-version: ['3.10', '3.11', '3.12', '3.13-dev']
25-
pari-version: ['pari-2.13.0', 'pari-2.15.4', 'pari-2.15.5', '2.17.1']
23+
python-version: ['3.10', '3.11', '3.12', '3.13']
24+
pari-version: ['pari-2.13.0', 'pari-2.15.4', 'pari-2.15.5', '2.17.2']
2625
env:
2726
LC_ALL: C
2827
PARI_VERSION: ${{ matrix.pari-version }}
@@ -69,7 +68,7 @@ jobs:
6968
path: upstream
7069
name: upstream
7170

72-
linux-sage:
71+
sage:
7372
uses: sagemath/sage/.github/workflows/docker.yml@develop
7473
with:
7574
targets: SAGE_CHECK=no SAGE_CHECK_PACKAGES="cypari" cypari
@@ -80,41 +79,8 @@ jobs:
8079
# We prefix the image name with the SPKG name ("cypari2-") to avoid the error
8180
# 'Package "sage-docker-..." is already associated with another repository.'
8281
docker_push_repository: ghcr.io/${{ github.repository }}/cypari2-
83-
needs: [dist]
84-
85-
linux-sage-incremental:
86-
uses: sagemath/sage/.github/workflows/docker.yml@develop
87-
with:
88-
# Build incrementally from published Docker image
89-
incremental: true
90-
free_disk_space: true
91-
from_docker_repository: ghcr.io/sagemath/sage/
92-
from_docker_target: "with-targets"
93-
from_docker_tag: "dev"
94-
docker_targets: "with-targets"
95-
targets_pre: build/make/Makefile
96-
targets: "cypari-uninstall build doc-html ptest"
97-
targets_optional: build/make/Makefile
98-
sage_repo: sagemath/sage
99-
sage_ref: develop
100-
upstream_artifact: upstream
101-
# We prefix the image name with the SPKG name ("cypari2-") to avoid the error
102-
# 'Package "sage-docker-..." is already associated with another repository.'
103-
docker_push_repository: ghcr.io/${{ github.repository }}/cypari2-
104-
needs: [linux-sage]
105-
106-
macos-sage:
107-
uses: sagemath/sage/.github/workflows/macos.yml@develop
108-
with:
109-
osversion_xcodeversion_toxenv_tuples: >-
110-
[["latest", "", "homebrew-macos-usrlocal-minimal"],
111-
["latest", "", "homebrew-macos-usrlocal-standard"],
112-
["latest", "", "conda-forge-macos-standard"]]
113-
targets: SAGE_CHECK=no SAGE_CHECK_PACKAGES="cypari" cypari
114-
# Standard setting: Test the current beta release of Sage
115-
sage_repo: sagemath/sage
116-
sage_ref: develop
117-
upstream_artifact: upstream
82+
tox_packages_factors: >-
83+
["standard"]
11884
needs: [dist]
11985

12086
env:

0 commit comments

Comments
 (0)