Skip to content

Commit

Permalink
Merge pull request #807 from hendriktews/ci-update
Browse files Browse the repository at this point in the history 
CI: replace Coq 8.20.0 with Coq 8.20.1
  • Loading branch information
@hendriktews
hendriktews authored Jan 25, 2025
2 parents d668946 + abdaa58 commit 77e8637
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 59 deletions.
63 changes: 27 additions & 36 deletions .github/workflows/test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,6 @@ jobs:
- coq-8.15.2-emacs-29.4
- coq-8.16.1-emacs-28.2
- coq-8.16.1-emacs-29.4
- 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.4
- coq-8.18.0-emacs-26.3
Expand All @@ -136,15 +133,15 @@ jobs:
- coq-8.19.2-emacs-28.2
- coq-8.19.2-emacs-29.3
- coq-8.19.2-emacs-29.4
- coq-8.20.0-emacs-26.3
- coq-8.20.0-emacs-27.1
- coq-8.20.0-emacs-27.2
- coq-8.20.0-emacs-28.1
- coq-8.20.0-emacs-28.2
- coq-8.20.0-emacs-29.1
- coq-8.20.0-emacs-29.2
- coq-8.20.0-emacs-29.3
- coq-8.20.0-emacs-29.4
- coq-8.20.1-emacs-26.3
- coq-8.20.1-emacs-27.1
- coq-8.20.1-emacs-27.2
- coq-8.20.1-emacs-28.1
- coq-8.20.1-emacs-28.2
- coq-8.20.1-emacs-29.1
- coq-8.20.1-emacs-29.2
- coq-8.20.1-emacs-29.3
- coq-8.20.1-emacs-29.4
# CIPG change marker end
# don't cancel all in-progress jobs if one matrix job fails:
fail-fast: false
Expand Down Expand Up @@ -199,9 +196,6 @@ jobs:
- coq-8.15.2-emacs-29.4
- coq-8.16.1-emacs-28.2
- coq-8.16.1-emacs-29.4
- 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.4
- coq-8.18.0-emacs-26.3
Expand All @@ -214,15 +208,15 @@ jobs:
- coq-8.19.2-emacs-28.2
- coq-8.19.2-emacs-29.3
- coq-8.19.2-emacs-29.4
- coq-8.20.0-emacs-26.3
- coq-8.20.0-emacs-27.1
- coq-8.20.0-emacs-27.2
- coq-8.20.0-emacs-28.1
- coq-8.20.0-emacs-28.2
- coq-8.20.0-emacs-29.1
- coq-8.20.0-emacs-29.2
- coq-8.20.0-emacs-29.3
- coq-8.20.0-emacs-29.4
- coq-8.20.1-emacs-26.3
- coq-8.20.1-emacs-27.1
- coq-8.20.1-emacs-27.2
- coq-8.20.1-emacs-28.1
- coq-8.20.1-emacs-28.2
- coq-8.20.1-emacs-29.1
- coq-8.20.1-emacs-29.2
- coq-8.20.1-emacs-29.3
- coq-8.20.1-emacs-29.4
# CIPG change marker end
# don't cancel all in-progress jobs if one matrix job fails:
fail-fast: false
Expand Down Expand Up @@ -273,9 +267,6 @@ jobs:
- coq-8.15.2-emacs-29.4
- coq-8.16.1-emacs-28.2
- coq-8.16.1-emacs-29.4
- 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.4
- coq-8.18.0-emacs-26.3
Expand All @@ -288,15 +279,15 @@ jobs:
- coq-8.19.2-emacs-28.2
- coq-8.19.2-emacs-29.3
- coq-8.19.2-emacs-29.4
- coq-8.20.0-emacs-26.3
- coq-8.20.0-emacs-27.1
- coq-8.20.0-emacs-27.2
- coq-8.20.0-emacs-28.1
- coq-8.20.0-emacs-28.2
- coq-8.20.0-emacs-29.1
- coq-8.20.0-emacs-29.2
- coq-8.20.0-emacs-29.3
- coq-8.20.0-emacs-29.4
- coq-8.20.1-emacs-26.3
- coq-8.20.1-emacs-27.1
- coq-8.20.1-emacs-27.2
- coq-8.20.1-emacs-28.1
- coq-8.20.1-emacs-28.2
- coq-8.20.1-emacs-29.1
- coq-8.20.1-emacs-29.2
- coq-8.20.1-emacs-29.3
- coq-8.20.1-emacs-29.4
# CIPG change marker end
# don't cancel all in-progress jobs if one matrix job fails:
fail-fast: false
Expand Down
16 changes: 8 additions & 8 deletions ci/doc/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ This results in
<!-- The content between the CIPG markers is automatically changed by
!-- the cipg program. Do not change these markers. -->
<!-- CIPG change marker: container-number -->
62
57
<!-- CIPG change marker end -->
containers.

Expand All @@ -184,11 +184,11 @@ containers.
| 8.13.2 | | SUP | | H | | | | | | N |
| 8.14.1 | | SUP | | H | | | | | | N |
| 8.15.2 | | SUP | SUP | | H | | | | | N |
| 8.16.1 | | X | X | X | X | X | X | X | X | X |
| 8.16.1 | | SUP | SUP | | | SUP | | | | N |
| 8.17.1 | | X | X | X | X | X | X | X | X | X |
| 8.18.0 | | X | X | X | X | X | X | X | X | X |
| 8.19.2 | | X | X | X | X | X | X | X | X | X |
| 8.20.0 | | X | X | X | X | X | X | X | X | X |
| 8.20.1 | | X | X | X | X | X | X | X | X | X |
<!-- CIPG change marker end -->

In the table above,
Expand Down Expand Up @@ -285,7 +285,7 @@ This results in
<!-- The content between the CIPG markers is automatically changed by
!-- the cipg program. Do not change these markers. -->
<!-- CIPG change marker: testrun-number -->
37
34
<!-- CIPG change marker end -->
version pairs for the Proof General interaction tests with Coq.

Expand All @@ -302,10 +302,10 @@ version pairs for the Proof General interaction tests with Coq.
| 8.14.1 | | | | H | | | | | | N |
| 8.15.2 | | | SUP | | H | | | | | N |
| 8.16.1 | | | | | | SUP | | | | N |
| 8.17.1 | | X | X | | | X | H | | | N |
| 8.18.0 | | X | X | | | X | | | SUP | N |
| 8.17.1 | | | | | | | H | | | N |
| 8.18.0 | | X | X | | | X | | | X | N |
| 8.19.2 | | X | X | | | X | | | X | N |
| 8.20.0 | | X | X | N | N | X | N | N | X | N |
| 8.20.1 | | X | X | N | N | X | N | N | X | N |
<!-- CIPG change marker end -->

See [Container build strategy](#contbuild) for an explanation of the
Expand All @@ -315,7 +315,7 @@ In summary, all Proof General testing jobs run
<!-- The content between the CIPG markers is automatically changed by
!-- the cipg program. Do not change these markers. -->
<!-- CIPG change marker: total-checks-number -->
140
131
<!-- CIPG change marker end -->
github checks.

Expand Down
1 change: 1 addition & 0 deletions ci/doc/coq-emacs-releases.org
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

| date | coq | emacs | distribution name | EOL | historic |
|---------+--------+-------+-------------------+----------+----------|
| 2025/01 | 8.20.1 | | | | |
| 2024/09 | 8.20.0 | | | | |
| 2024/06 | 8.19.2 | 29.4 | | | |
| 2024/03 | 8.19.1 | 29.3 | | | |
Expand Down
23 changes: 9 additions & 14 deletions ci/doc/currently-used-coq-emacs-versions
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,7 @@ coq-8.15.2-emacs-28.1
coq-8.15.2-emacs-29.4
coq-8.16.1-emacs-26.3
coq-8.16.1-emacs-27.1
coq-8.16.1-emacs-27.2
coq-8.16.1-emacs-28.1
coq-8.16.1-emacs-28.2
coq-8.16.1-emacs-29.1
coq-8.16.1-emacs-29.2
coq-8.16.1-emacs-29.3
coq-8.16.1-emacs-29.4
coq-8.17.1-emacs-26.3
coq-8.17.1-emacs-27.1
Expand Down Expand Up @@ -51,12 +46,12 @@ coq-8.19.2-emacs-29.1
coq-8.19.2-emacs-29.2
coq-8.19.2-emacs-29.3
coq-8.19.2-emacs-29.4
coq-8.20.0-emacs-26.3
coq-8.20.0-emacs-27.1
coq-8.20.0-emacs-27.2
coq-8.20.0-emacs-28.1
coq-8.20.0-emacs-28.2
coq-8.20.0-emacs-29.1
coq-8.20.0-emacs-29.2
coq-8.20.0-emacs-29.3
coq-8.20.0-emacs-29.4
coq-8.20.1-emacs-26.3
coq-8.20.1-emacs-27.1
coq-8.20.1-emacs-27.2
coq-8.20.1-emacs-28.1
coq-8.20.1-emacs-28.2
coq-8.20.1-emacs-29.1
coq-8.20.1-emacs-29.2
coq-8.20.1-emacs-29.3
coq-8.20.1-emacs-29.4
2 changes: 1 addition & 1 deletion ci/doc/currently-used-coq-nix-versions
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
8.17.1
8.18.0
8.19.2
8.20.0
8.20.1

0 comments on commit 77e8637

Please sign in to comment.