Skip to content

Commit acf1c1c

Browse files
author
Release Manager
committed
gh-40448: Replace ci-linux-incremental by ci-linux <!-- ^ Please provide a concise and informative title. --> <!-- ^ Don't put issue numbers in the title, do this in the PR description below. --> <!-- ^ For example, instead of "Fixes #12345" use "Introduce new method to calculate 1 + 2". --> <!-- v Describe your changes below in detail. --> <!-- v Why is this change required? What problem does it solve? --> <!-- v If this PR resolves an open issue, please link to it here. For example, "Fixes #12345". --> The incremental runs are supposed to test package updates - however, exactly in those situations, they are not working since the rebuilt sagelib is not linking correctly against the new versions. For example, in the flint update #40259, we get > [sagemath_doc_html-none] [spkg-install] from sage.rings import complex_interval, integer [sagemath_doc_html-none] [spkg-install] ImportError: libflint.so.20: cannot open shared object file: No such file or directory https://github.com/sagemath/sage/actions/runs/15979364834/job/4507007300 7?pr=40259#step:11:4686 For this reason, the incremental runs are replaced here by the build- from-zero runs. Those are a bit slower but more reliable. ### :memo: Checklist <!-- Put an `x` in all the boxes that apply. --> - [ ] The title is concise and informative. - [ ] The description explains in detail what this PR is about. - [ ] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation and checked the documentation preview. ### :hourglass: Dependencies <!-- List all open PRs that this PR logically depends on. For example, --> <!-- - #12345: short description why this is a dependency --> <!-- - #34567: ... --> URL: #40448 Reported by: Tobias Diez Reviewer(s): Dima Pasechnik
2 parents a686ec4 + ee217f6 commit acf1c1c

File tree

4 files changed

+21
-113
lines changed

4 files changed

+21
-113
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ concurrency:
3535
#
3636
# each build Sage:
3737
#
38-
# - incrementally starting from a Docker image that ci-linux.yml
38+
# - incrementally starting from a Docker image that ci-distro.yml
3939
# publishes on each development release to ghcr.io,
4040
# - orchestrated using a tox-generated Dockerfile,
4141
# - using https://github.com/marketplace/actions/build-and-push-docker-images,

.github/workflows/ci-linux.yml renamed to .github/workflows/ci-distro.yml

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
name: CI Linux
1+
name: CI (Distro)
22

3-
## This GitHub Actions workflow runs SAGE_ROOT/tox.ini with selected environments,
4-
## whenever a tag is pushed.
3+
## This GitHub Actions workflow builds and tests sage with selected environments,
4+
## whenever a tag is pushed or a pull request changes relevant build files.
55
##
66
## It builds and checks some sage spkgs as defined in TARGETS.
77
##
@@ -14,9 +14,18 @@ name: CI Linux
1414
## After all jobs have finished (or are canceled) and a short delay,
1515
## tar files of all logs are made available as "build artifacts".
1616

17-
#on: [push, pull_request]
18-
1917
on:
18+
pull_request:
19+
paths:
20+
- '.github/workflows/ci-distro.yml'
21+
- 'build/pkgs/**'
22+
- 'configure.ac'
23+
- '!build/pkgs/sage_conf/**'
24+
- '!build/pkgs/sage_docbuild/**'
25+
- '!build/pkgs/sage_setup/**'
26+
- '!build/pkgs/sage_sws2rst/**'
27+
- '!build/pkgs/sagelib/**'
28+
- '!build/pkgs/sagemath_*/**'
2029
push:
2130
tags:
2231
- '*'
@@ -31,6 +40,11 @@ env:
3140
permissions:
3241
packages: write
3342

43+
concurrency:
44+
# Cancel previous runs of this workflow for the same branch
45+
group: ${{ github.workflow }}-${{ github.ref }}
46+
cancel-in-progress: true
47+
3448
jobs:
3549
minimal:
3650
if: ${{ success() || failure() }}

.github/workflows/ci-linux-incremental.yml

Lines changed: 0 additions & 106 deletions
This file was deleted.

src/doc/en/developer/portability_testing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1003,7 +1003,7 @@ on every release tag.
10031003

10041004
This is defined in the files
10051005

1006-
- :sage_root:`.github/workflows/ci-linux.yml`
1006+
- :sage_root:`.github/workflows/ci-distro.yml`
10071007
(which calls :sage_root:`.github/workflows/docker.yml`) and
10081008

10091009
- :sage_root:`.github/workflows/ci-macos.yml`

0 commit comments

Comments
 (0)