Skip to content

Commit

Permalink
Merge pull request #792 from hendriktews/del-cont
Browse files Browse the repository at this point in the history 
CI: add Ubuntu 24 release; delete unused containers
  • Loading branch information
@hendriktews
hendriktews authored Oct 4, 2024
2 parents 1ffca70 + 88add4d commit b30d65d
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 35 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,12 @@ jobs:
- 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.3
- coq-8.18.0-emacs-29.4
- coq-8.19.2-emacs-26.3
- coq-8.19.2-emacs-27.1
- 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
Expand Down Expand Up @@ -205,10 +207,12 @@ jobs:
- 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.3
- coq-8.18.0-emacs-29.4
- coq-8.19.2-emacs-26.3
- coq-8.19.2-emacs-27.1
- 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
Expand Down Expand Up @@ -277,10 +281,12 @@ jobs:
- 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.3
- coq-8.18.0-emacs-29.4
- coq-8.19.2-emacs-26.3
- coq-8.19.2-emacs-27.1
- 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
Expand Down
64 changes: 31 additions & 33 deletions ci/doc/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,28 +168,27 @@ 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 -->
63
62
<!-- CIPG change marker end -->
containers.

<!-- The content between the CIPG markers is automatically changed by
!-- the cipg program. Do not change these markers. -->
<!-- CIPG change marker: container-table -->
| | 26.1 | 26.2 | 26.3 | 27.1 | 27.2 | 28.1 | 28.2 | 29.1 | 29.2 | 29.3 | 29.4 |
|---------+------+------+------+------+------+------+------+------+------+------+------|
| 8.8.2 | H | | | | | | | | | | |
| 8.9.1 | | H | | | | | | | | | |
| 8.10.2 | | | H | | | | | | | | |
| 8.11.2 | | | SUP | | | | | | | | N |
| 8.12.2 | | | SUP | H | | | | | | | N |
| 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.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 |
| | 26.2 | 26.3 | 27.1 | 27.2 | 28.1 | 28.2 | 29.1 | 29.2 | 29.3 | 29.4 |
|---------+------+------+------+------+------+------+------+------+------+------|
| 8.9.1 | H | | | | | | | | | |
| 8.10.2 | | H | | | | | | | | |
| 8.11.2 | | SUP | | | | | | | | N |
| 8.12.2 | | SUP | H | | | | | | | N |
| 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.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 |
<!-- CIPG change marker end -->

In the table above,
Expand Down Expand Up @@ -286,28 +285,27 @@ 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 -->
35
37
<!-- CIPG change marker end -->
version pairs for the Proof General interaction tests with Coq.

<!-- The content between the CIPG markers is automatically changed by
!-- the cipg program. Do not change these markers. -->
<!-- CIPG change marker: testrun-table -->
| | 26.1 | 26.2 | 26.3 | 27.1 | 27.2 | 28.1 | 28.2 | 29.1 | 29.2 | 29.3 | 29.4 |
|---------+------+------+------+------+------+------+------+------+------+------+------|
| 8.8.2 | | | | | | | | | | | |
| 8.9.1 | | | | | | | | | | | |
| 8.10.2 | | | | | | | | | | | |
| 8.11.2 | | | SUP | | | | | | | | N |
| 8.12.2 | | | | H | | | | | | | N |
| 8.13.2 | | | | | H | | | | | | N |
| 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 | | | | N |
| 8.19.2 | | | X | X | | | X | | | | N |
| 8.20.0 | | | X | X | N | N | X | N | N | N | N |
| | 26.2 | 26.3 | 27.1 | 27.2 | 28.1 | 28.2 | 29.1 | 29.2 | 29.3 | 29.4 |
|---------+------+------+------+------+------+------+------+------+------+------|
| 8.9.1 | | | | | | | | | | |
| 8.10.2 | | | | | | | | | | |
| 8.11.2 | | SUP | | | | | | | | N |
| 8.12.2 | | | H | | | | | | | N |
| 8.13.2 | | | | H | | | | | | N |
| 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.19.2 | | X | X | | | X | | | X | N |
| 8.20.0 | | 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 @@ -317,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 -->
134
140
<!-- 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 @@ -17,6 +17,7 @@
| 2024/06 | 8.19.2 | 29.4 | | | |
| 2024/03 | 8.19.1 | 29.3 | | | |
| 2024/01 | 8.19.0 | 29.2 | | | |
| 2024/04 | | 29.3 | ubu 24 noble num | 2029/06 | |
| 2023/09 | 8.18.0 | | | | |
| 2023/07 | | 29.1 | | | X |
| 2023/06 | 8.17.1 | | | | |
Expand Down
1 change: 0 additions & 1 deletion ci/doc/currently-used-coq-emacs-versions
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
coq-8.8.2-emacs-26.1
coq-8.9.1-emacs-26.2
coq-8.10.2-emacs-26.3
coq-8.11.2-emacs-26.3
Expand Down
1 change: 0 additions & 1 deletion ci/doc/currently-used-coq-nix-versions
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
8.8.2
8.9.1
8.10.2
8.11.2
Expand Down

0 comments on commit b30d65d

Please sign in to comment.