Skip to content

Commit 152035b

Browse files
author
Release Manager
committed
gh-36829: CI Linux incremental: `make reconfigure` after uninstalling packages <!-- ^^^^^ Please provide a concise, informative and self-explanatory title. Don't put issue numbers in there, do this in the PR body below. For example, instead of "Fixes #1234" use "Introduce new method to calculate 1+1" --> <!-- Describe your changes here in detail --> As observed in #36792 (comment), the "CI Linux incremental" workflow, which is run when package scripts are updated, is not helpful when testing new or modified `spkg-configure.m4` scripts when the SPKG has been installed: Although we uninstall packages with changed spkg-configure.m4 scripts already, a re-run of configure is not (always?) triggered. So here we invoke it explicitly, using a new makefile target `make reconfigure`. (This new target also simplifies instructions issued by the system package advice facility.) <!-- Why is this change required? What problem does it solve? --> <!-- If this PR resolves an open issue, please link to it here. For example "Fixes #12345". --> <!-- If your change requires a documentation PR, please link it appropriately. --> ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> <!-- If your change requires a documentation PR, please link it appropriately --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> <!-- Feel free to remove irrelevant items. --> - [x] The title is concise, informative, and self-explanatory. - [x] The description explains in detail what this PR is about. - [x] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation accordingly. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on - #12345: short description why this is a dependency - #34567: ... --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> URL: #36829 Reported by: Matthias Köppe Reviewer(s): Kwankyu Lee, Matthias Köppe
2 parents cecd9a2 + ce89bf6 commit 152035b

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
from_docker_target: "with-targets"
8484
from_docker_tag: "dev"
8585
docker_targets: "with-targets"
86-
targets: "${{needs.changed_files.outputs.uninstall_targets}} ${{needs.changed_files.outputs.build_targets}} build doc-html ptest"
86+
targets: "${{needs.changed_files.outputs.uninstall_targets}} reconfigure ${{needs.changed_files.outputs.build_targets}} build doc-html ptest"
8787
tox_system_factors: >-
8888
["ubuntu-focal",
8989
"ubuntu-jammy",
@@ -119,7 +119,7 @@ jobs:
119119
from_docker_target: "with-targets"
120120
from_docker_tag: "dev"
121121
docker_targets: "with-targets"
122-
targets: "${{needs.changed_files.outputs.uninstall_targets}} ${{needs.changed_files.outputs.build_targets}} build doc-html ptest"
122+
targets: "${{needs.changed_files.outputs.uninstall_targets}} reconfigure ${{needs.changed_files.outputs.build_targets}} build doc-html ptest"
123123
# Only test systems with a usable system python (>= 3.9)
124124
# with only a small number of test failures as of 10.2.rc0
125125
tox_system_factors: >-

Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ SPKG_COLLECT_FILES = build/pkgs/*/type build/pkgs/*/package-version.txt build/pk
5050
# If configure was run before, rerun it with the old arguments.
5151
# Otherwise, run configure with argument $PREREQ_OPTIONS.
5252
build/make/Makefile: configure $(SPKG_COLLECT_FILES) $(CONFIG_FILES:%=%.in)
53+
$(MAKE) reconfigure
54+
55+
reconfigure:
5356
rm -f config.log
5457
mkdir -p logs/pkgs
5558
ln -s logs/pkgs/config.log config.log
@@ -339,7 +342,7 @@ list:
339342
@$(MAKE) --silent build/make/Makefile >&2
340343
@$(MAKE) --silent -f build/make/Makefile SAGE_PKGCONFIG=dummy $@
341344

342-
.PHONY: default build dist install micro_release \
345+
.PHONY: default build dist install micro_release reconfigure \
343346
misc-clean bdist-clean distclean bootstrap-clean maintainer-clean \
344347
test check testoptional testall testlong testoptionallong testallong \
345348
ptest ptestoptional ptestall ptestlong ptestoptionallong ptestallong \

m4/sage_spkg_collect.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ $COMMAND
434434
435435
hint: After installation, re-run configure using:
436436
437-
\$ ./config.status --recheck && ./config.status
437+
\$ make reconfigure
438438
])
439439
], [
440440
AC_MSG_NOTICE([No equivalent system packages for $SYSTEM are known to Sage])

src/doc/en/developer/portability_testing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ following::
230230
configure: hint: installing the following system packages is recommended and may avoid building some of the above SPKGs from source:
231231
configure: $ sudo apt-get install libflint-arb-dev ... libzmq3-dev libz-dev
232232
configure: After installation, re-run configure using:
233-
configure: $ ./config.status --recheck && ./config.status
233+
configure: $ make reconfigure
234234

235235
This information comes from Sage's database of equivalent distribution
236236
packages. For example::

0 commit comments

Comments
 (0)