Skip to content

Commit

Permalink
CI: correctly handle Coq patch levels
Browse files Browse the repository at this point in the history 
Add Coq patch level numbers to Coq versions in container tags and
handle patch level numbers correctly in cipg.
  • Loading branch information
@hendriktews
hendriktews committed Mar 23, 2024
1 parent 01ea35f commit 68d1184
Show file tree
Hide file tree
Showing 3 changed files with 247 additions and 164 deletions.
192 changes: 96 additions & 96 deletions .github/workflows/test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,38 +106,38 @@ jobs:
# The content between the CIPG markers is automatically
# changed by the cipg program. Do not change these markers.
# CIPG change marker: test-coq-emacs-versions
- coq-8.11-emacs-26.3
- coq-8.11-emacs-29.2
- coq-8.12-emacs-27.1
- coq-8.12-emacs-29.2
- coq-8.13-emacs-27.2
- coq-8.13-emacs-29.2
- coq-8.14-emacs-27.2
- coq-8.14-emacs-29.2
- coq-8.15-emacs-27.1
- coq-8.15-emacs-28.1
- coq-8.15-emacs-29.2
- coq-8.16-emacs-26.3
- coq-8.16-emacs-27.1
- coq-8.16-emacs-28.2
- coq-8.16-emacs-29.2
- coq-8.17-emacs-26.3
- coq-8.17-emacs-27.1
- coq-8.17-emacs-28.2
- coq-8.17-emacs-29.1
- coq-8.17-emacs-29.2
- coq-8.18-emacs-26.3
- coq-8.18-emacs-27.1
- coq-8.18-emacs-28.2
- coq-8.18-emacs-29.1
- coq-8.18-emacs-29.2
- coq-8.19-emacs-26.3
- coq-8.19-emacs-27.1
- coq-8.19-emacs-27.2
- coq-8.19-emacs-28.1
- coq-8.19-emacs-28.2
- coq-8.19-emacs-29.1
- coq-8.19-emacs-29.2
- coq-8.11.2-emacs-26.3
- coq-8.11.2-emacs-29.2
- coq-8.12.2-emacs-27.1
- coq-8.12.2-emacs-29.2
- coq-8.13.2-emacs-27.2
- coq-8.13.2-emacs-29.2
- coq-8.14.1-emacs-27.2
- coq-8.14.1-emacs-29.2
- coq-8.15.2-emacs-27.1
- coq-8.15.2-emacs-28.1
- coq-8.15.2-emacs-29.2
- coq-8.16.1-emacs-26.3
- coq-8.16.1-emacs-27.1
- coq-8.16.1-emacs-28.2
- coq-8.16.1-emacs-29.2
- coq-8.17.1-emacs-26.3
- coq-8.17.1-emacs-27.1
- coq-8.17.1-emacs-28.2
- coq-8.17.1-emacs-29.1
- coq-8.17.1-emacs-29.2
- coq-8.18.0-emacs-26.3
- coq-8.18.0-emacs-27.1
- coq-8.18.0-emacs-28.2
- coq-8.18.0-emacs-29.1
- coq-8.18.0-emacs-29.2
- coq-8.19.1-emacs-26.3
- coq-8.19.1-emacs-27.1
- coq-8.19.1-emacs-27.2
- coq-8.19.1-emacs-28.1
- coq-8.19.1-emacs-28.2
- coq-8.19.1-emacs-29.1
- coq-8.19.1-emacs-29.2
# CIPG change marker end
# don't cancel all in-progress jobs if one matrix job fails:
fail-fast: false
Expand Down Expand Up @@ -179,38 +179,38 @@ jobs:
# The content between the CIPG markers is automatically
# changed by the cipg program. Do not change these markers.
# CIPG change marker: compile-coq-emacs-versions
- coq-8.11-emacs-26.3
- coq-8.11-emacs-29.2
- coq-8.12-emacs-27.1
- coq-8.12-emacs-29.2
- coq-8.13-emacs-27.2
- coq-8.13-emacs-29.2
- coq-8.14-emacs-27.2
- coq-8.14-emacs-29.2
- coq-8.15-emacs-27.1
- coq-8.15-emacs-28.1
- coq-8.15-emacs-29.2
- coq-8.16-emacs-26.3
- coq-8.16-emacs-27.1
- coq-8.16-emacs-28.2
- coq-8.16-emacs-29.2
- coq-8.17-emacs-26.3
- coq-8.17-emacs-27.1
- coq-8.17-emacs-28.2
- coq-8.17-emacs-29.1
- coq-8.17-emacs-29.2
- coq-8.18-emacs-26.3
- coq-8.18-emacs-27.1
- coq-8.18-emacs-28.2
- coq-8.18-emacs-29.1
- coq-8.18-emacs-29.2
- coq-8.19-emacs-26.3
- coq-8.19-emacs-27.1
- coq-8.19-emacs-27.2
- coq-8.19-emacs-28.1
- coq-8.19-emacs-28.2
- coq-8.19-emacs-29.1
- coq-8.19-emacs-29.2
- coq-8.11.2-emacs-26.3
- coq-8.11.2-emacs-29.2
- coq-8.12.2-emacs-27.1
- coq-8.12.2-emacs-29.2
- coq-8.13.2-emacs-27.2
- coq-8.13.2-emacs-29.2
- coq-8.14.1-emacs-27.2
- coq-8.14.1-emacs-29.2
- coq-8.15.2-emacs-27.1
- coq-8.15.2-emacs-28.1
- coq-8.15.2-emacs-29.2
- coq-8.16.1-emacs-26.3
- coq-8.16.1-emacs-27.1
- coq-8.16.1-emacs-28.2
- coq-8.16.1-emacs-29.2
- coq-8.17.1-emacs-26.3
- coq-8.17.1-emacs-27.1
- coq-8.17.1-emacs-28.2
- coq-8.17.1-emacs-29.1
- coq-8.17.1-emacs-29.2
- coq-8.18.0-emacs-26.3
- coq-8.18.0-emacs-27.1
- coq-8.18.0-emacs-28.2
- coq-8.18.0-emacs-29.1
- coq-8.18.0-emacs-29.2
- coq-8.19.1-emacs-26.3
- coq-8.19.1-emacs-27.1
- coq-8.19.1-emacs-27.2
- coq-8.19.1-emacs-28.1
- coq-8.19.1-emacs-28.2
- coq-8.19.1-emacs-29.1
- coq-8.19.1-emacs-29.2
# CIPG change marker end
# don't cancel all in-progress jobs if one matrix job fails:
fail-fast: false
Expand Down Expand Up @@ -248,38 +248,38 @@ jobs:
# The content between the CIPG markers is automatically
# changed by the cipg program. Do not change these markers.
# CIPG change marker: simple-coq-emacs-versions
- coq-8.11-emacs-26.3
- coq-8.11-emacs-29.2
- coq-8.12-emacs-27.1
- coq-8.12-emacs-29.2
- coq-8.13-emacs-27.2
- coq-8.13-emacs-29.2
- coq-8.14-emacs-27.2
- coq-8.14-emacs-29.2
- coq-8.15-emacs-27.1
- coq-8.15-emacs-28.1
- coq-8.15-emacs-29.2
- coq-8.16-emacs-26.3
- coq-8.16-emacs-27.1
- coq-8.16-emacs-28.2
- coq-8.16-emacs-29.2
- coq-8.17-emacs-26.3
- coq-8.17-emacs-27.1
- coq-8.17-emacs-28.2
- coq-8.17-emacs-29.1
- coq-8.17-emacs-29.2
- coq-8.18-emacs-26.3
- coq-8.18-emacs-27.1
- coq-8.18-emacs-28.2
- coq-8.18-emacs-29.1
- coq-8.18-emacs-29.2
- coq-8.19-emacs-26.3
- coq-8.19-emacs-27.1
- coq-8.19-emacs-27.2
- coq-8.19-emacs-28.1
- coq-8.19-emacs-28.2
- coq-8.19-emacs-29.1
- coq-8.19-emacs-29.2
- coq-8.11.2-emacs-26.3
- coq-8.11.2-emacs-29.2
- coq-8.12.2-emacs-27.1
- coq-8.12.2-emacs-29.2
- coq-8.13.2-emacs-27.2
- coq-8.13.2-emacs-29.2
- coq-8.14.1-emacs-27.2
- coq-8.14.1-emacs-29.2
- coq-8.15.2-emacs-27.1
- coq-8.15.2-emacs-28.1
- coq-8.15.2-emacs-29.2
- coq-8.16.1-emacs-26.3
- coq-8.16.1-emacs-27.1
- coq-8.16.1-emacs-28.2
- coq-8.16.1-emacs-29.2
- coq-8.17.1-emacs-26.3
- coq-8.17.1-emacs-27.1
- coq-8.17.1-emacs-28.2
- coq-8.17.1-emacs-29.1
- coq-8.17.1-emacs-29.2
- coq-8.18.0-emacs-26.3
- coq-8.18.0-emacs-27.1
- coq-8.18.0-emacs-28.2
- coq-8.18.0-emacs-29.1
- coq-8.18.0-emacs-29.2
- coq-8.19.1-emacs-26.3
- coq-8.19.1-emacs-27.1
- coq-8.19.1-emacs-27.2
- coq-8.19.1-emacs-28.1
- coq-8.19.1-emacs-28.2
- coq-8.19.1-emacs-29.1
- coq-8.19.1-emacs-29.2
# CIPG change marker end
# don't cancel all in-progress jobs if one matrix job fails:
fail-fast: false
Expand Down
50 changes: 25 additions & 25 deletions ci/doc/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ Currently, the first actively supported versions are
<!-- The content between the CIPG markers is automatically changed by
!-- the cipg program. Do not change these markers. -->
<!-- CIPG change marker: coq-emacs-versions -->
| Coq | 8.11 |
| Coq | 8.11.2 |
|-------+-------|
| Emacs | 26.3 |
<!-- CIPG change marker end -->
Expand Down Expand Up @@ -171,18 +171,18 @@ containers.
<!-- CIPG change marker: container-table -->
| | 26.1 | 26.2 | 26.3 | 27.1 | 27.2 | 28.1 | 28.2 | 29.1 | 29.2 |
|---------+------+------+------+------+------+------+------+------+------|
| 8.8 | H | | | | | | | | |
| 8.9 | | H | | | | | | | |
| 8.10 | | | H | | | | | | |
| 8.11 | | | SUP | | | | | | N |
| 8.12 | | | SUP | SUP | | | | | N |
| 8.13 | | | SUP | SUP | H | | | | N |
| 8.14 | | | SUP | SUP | H | | | | N |
| 8.15 | | | X | X | X | X | X | X | X |
| 8.16 | | | X | X | X | X | X | X | X |
| 8.17 | | | X | X | X | X | X | X | X |
| 8.18 | | | X | X | X | X | X | X | X |
| 8.19 | | | X | X | X | X | X | X | X |
| 8.8.2 | H | | | | | | | | |
| 8.9.1 | | H | | | | | | | |
| 8.10.2 | | | H | | | | | | |
| 8.11.2 | | | SUP | | | | | | N |
| 8.12.2 | | | SUP | SUP | | | | | N |
| 8.13.2 | | | SUP | SUP | H | | | | N |
| 8.14.1 | | | SUP | SUP | H | | | | N |
| 8.15.2 | | | X | X | X | X | X | X | X |
| 8.16.1 | | | X | X | X | X | X | X | X |
| 8.17.1 | | | X | X | X | X | X | X | X |
| 8.18.0 | | | X | X | X | X | X | X | X |
| 8.19.1 | | | X | X | X | X | X | X | X |
<!-- CIPG change marker end -->

In the table above,
Expand Down Expand Up @@ -289,18 +289,18 @@ version pairs for the Proof General interaction tests with Coq.
<!-- CIPG change marker: testrun-table -->
| | 26.1 | 26.2 | 26.3 | 27.1 | 27.2 | 28.1 | 28.2 | 29.1 | 29.2 |
|---------+------+------+------+------+------+------+------+------+------|
| 8.8 | | | | | | | | | |
| 8.9 | | | | | | | | | |
| 8.10 | | | | | | | | | |
| 8.11 | | | SUP | | | | | | N |
| 8.12 | | | | SUP | | | | | N |
| 8.13 | | | | | H | | | | N |
| 8.14 | | | | | H | | | | N |
| 8.15 | | | | SUP | | H | | | N |
| 8.16 | | | X | X | | | X | | N |
| 8.17 | | | X | X | | | X | SUP | N |
| 8.18 | | | X | X | | | X | X | N |
| 8.19 | | | X | X | N | N | X | X | N |
| 8.8.2 | | | | | | | | | |
| 8.9.1 | | | | | | | | | |
| 8.10.2 | | | | | | | | | |
| 8.11.2 | | | SUP | | | | | | N |
| 8.12.2 | | | | SUP | | | | | N |
| 8.13.2 | | | | | H | | | | N |
| 8.14.1 | | | | | H | | | | N |
| 8.15.2 | | | | SUP | | H | | | N |
| 8.16.1 | | | X | X | | | X | | N |
| 8.17.1 | | | X | X | | | X | SUP | N |
| 8.18.0 | | | X | X | | | X | X | N |
| 8.19.1 | | | X | X | N | N | X | X | N |
<!-- CIPG change marker end -->

See [Container build strategy](#contbuild) for an explanation of the
Expand Down
Loading

0 comments on commit 68d1184

Please sign in to comment.