From c164b744098de3f2eae085f233f2944302976d7e Mon Sep 17 00:00:00 2001 From: Hendrik Tews Date: Thu, 27 Jun 2024 11:15:54 +0200 Subject: [PATCH] CI: update to Coq 8.19.2 and Emacs 29.4 --- .github/workflows/test.yml | 110 +++++++++++------------ ci/doc/README.md | 58 ++++++------ ci/doc/coq-emacs-releases.org | 1 + ci/doc/currently-used-coq-emacs-versions | 34 +++---- ci/doc/currently-used-coq-nix-versions | 2 +- 5 files changed, 103 insertions(+), 102 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c81ed67bc..f14783b45 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -38,6 +38,7 @@ jobs: - 29.1 - 29.2 - 29.3 + - 29.4 # CIPG change marker end # don't cancel all in-progress jobs if one matrix job fails: fail-fast: false @@ -80,7 +81,7 @@ jobs: # changed by the cipg program. Do not change these markers. # CIPG change marker: magic-emacs-version - 28.2 - - 29.3 + - 29.4 # CIPG change marker end # don't cancel all in-progress jobs if one matrix job fails: fail-fast: false @@ -108,38 +109,37 @@ jobs: # changed by the cipg program. Do not change these markers. # CIPG change marker: test-coq-emacs-versions - coq-8.11.2-emacs-26.3 - - coq-8.11.2-emacs-29.3 + - coq-8.11.2-emacs-29.4 - coq-8.12.2-emacs-27.1 - - coq-8.12.2-emacs-29.3 + - coq-8.12.2-emacs-29.4 - coq-8.13.2-emacs-27.2 - - coq-8.13.2-emacs-29.3 + - coq-8.13.2-emacs-29.4 - coq-8.14.1-emacs-27.2 - - coq-8.14.1-emacs-29.3 + - coq-8.14.1-emacs-29.4 - coq-8.15.2-emacs-27.1 - coq-8.15.2-emacs-28.1 - - coq-8.15.2-emacs-29.3 - - coq-8.16.1-emacs-26.3 - - coq-8.16.1-emacs-27.1 + - coq-8.15.2-emacs-29.4 - coq-8.16.1-emacs-28.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 - coq-8.17.1-emacs-28.2 - coq-8.17.1-emacs-29.1 - - coq-8.17.1-emacs-29.3 + - coq-8.17.1-emacs-29.4 - 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.3 - - 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 - - coq-8.19.1-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-27.2 + - coq-8.19.2-emacs-28.1 + - coq-8.19.2-emacs-28.2 + - 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 # CIPG change marker end # don't cancel all in-progress jobs if one matrix job fails: fail-fast: false @@ -182,38 +182,37 @@ jobs: # changed by the cipg program. Do not change these markers. # CIPG change marker: compile-coq-emacs-versions - coq-8.11.2-emacs-26.3 - - coq-8.11.2-emacs-29.3 + - coq-8.11.2-emacs-29.4 - coq-8.12.2-emacs-27.1 - - coq-8.12.2-emacs-29.3 + - coq-8.12.2-emacs-29.4 - coq-8.13.2-emacs-27.2 - - coq-8.13.2-emacs-29.3 + - coq-8.13.2-emacs-29.4 - coq-8.14.1-emacs-27.2 - - coq-8.14.1-emacs-29.3 + - coq-8.14.1-emacs-29.4 - coq-8.15.2-emacs-27.1 - coq-8.15.2-emacs-28.1 - - coq-8.15.2-emacs-29.3 - - coq-8.16.1-emacs-26.3 - - coq-8.16.1-emacs-27.1 + - coq-8.15.2-emacs-29.4 - coq-8.16.1-emacs-28.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 - coq-8.17.1-emacs-28.2 - coq-8.17.1-emacs-29.1 - - coq-8.17.1-emacs-29.3 + - coq-8.17.1-emacs-29.4 - 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.3 - - 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 - - coq-8.19.1-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-27.2 + - coq-8.19.2-emacs-28.1 + - coq-8.19.2-emacs-28.2 + - 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 # CIPG change marker end # don't cancel all in-progress jobs if one matrix job fails: fail-fast: false @@ -252,38 +251,37 @@ jobs: # changed by the cipg program. Do not change these markers. # CIPG change marker: simple-coq-emacs-versions - coq-8.11.2-emacs-26.3 - - coq-8.11.2-emacs-29.3 + - coq-8.11.2-emacs-29.4 - coq-8.12.2-emacs-27.1 - - coq-8.12.2-emacs-29.3 + - coq-8.12.2-emacs-29.4 - coq-8.13.2-emacs-27.2 - - coq-8.13.2-emacs-29.3 + - coq-8.13.2-emacs-29.4 - coq-8.14.1-emacs-27.2 - - coq-8.14.1-emacs-29.3 + - coq-8.14.1-emacs-29.4 - coq-8.15.2-emacs-27.1 - coq-8.15.2-emacs-28.1 - - coq-8.15.2-emacs-29.3 - - coq-8.16.1-emacs-26.3 - - coq-8.16.1-emacs-27.1 + - coq-8.15.2-emacs-29.4 - coq-8.16.1-emacs-28.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 - coq-8.17.1-emacs-28.2 - coq-8.17.1-emacs-29.1 - - coq-8.17.1-emacs-29.3 + - coq-8.17.1-emacs-29.4 - 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.3 - - 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 - - coq-8.19.1-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-27.2 + - coq-8.19.2-emacs-28.1 + - coq-8.19.2-emacs-28.2 + - 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 # CIPG change marker end # don't cancel all in-progress jobs if one matrix job fails: fail-fast: false @@ -333,6 +331,7 @@ jobs: - 29.1 - 29.2 - 29.3 + - 29.4 # CIPG change marker end # don't cancel all in-progress jobs if one matrix job fails: fail-fast: false @@ -369,6 +368,7 @@ jobs: - 29.1 - 29.2 - 29.3 + - 29.4 # CIPG change marker end # don't cancel all in-progress jobs if one matrix job fails: fail-fast: false diff --git a/ci/doc/README.md b/ci/doc/README.md index 3ab4714cb..505e74767 100644 --- a/ci/doc/README.md +++ b/ci/doc/README.md @@ -169,20 +169,20 @@ containers. -| | 26.1 | 26.2 | 26.3 | 27.1 | 27.2 | 28.1 | 28.2 | 29.1 | 29.2 | 29.3 | -|---------+------+------+------+------+------+------+------+------+------+------| -| 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 | X | -| 8.16.1 | | | X | X | X | X | X | X | X | X | -| 8.17.1 | | | X | X | X | X | X | X | X | X | -| 8.18.0 | | | X | X | X | X | X | X | X | X | -| 8.19.1 | | | X | X | X | X | X | X | X | X | +| | 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 | SUP | | | | | | | N | +| 8.13.2 | | | SUP | SUP | H | | | | | | N | +| 8.14.1 | | | SUP | 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 | In the table above, @@ -280,27 +280,27 @@ This results in -33 +32 version pairs for the Proof General interaction tests with Coq. -| | 26.1 | 26.2 | 26.3 | 27.1 | 27.2 | 28.1 | 28.2 | 29.1 | 29.2 | 29.3 | -|---------+------+------+------+------+------+------+------+------+------+------| -| 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 | N | +| | 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 | | | | SUP | | | | | | | 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 | X | | | N | +| 8.18.0 | | | X | X | | | X | X | | | N | +| 8.19.2 | | | X | X | N | N | X | X | N | N | N | See [Container build strategy](#contbuild) for an explanation of the diff --git a/ci/doc/coq-emacs-releases.org b/ci/doc/coq-emacs-releases.org index 7df3911fc..be98ecd29 100644 --- a/ci/doc/coq-emacs-releases.org +++ b/ci/doc/coq-emacs-releases.org @@ -13,6 +13,7 @@ | date | coq | emacs | distribution name | EOL | historic | |---------+--------+-------+-------------------+----------+----------| +| 2024/06 | 8.19.2 | 29.4 | | | | | 2024/03 | 8.19.1 | 29.3 | | | | | 2024/01 | 8.19.0 | 29.2 | | | | | 2023/09 | 8.18.0 | | | | | diff --git a/ci/doc/currently-used-coq-emacs-versions b/ci/doc/currently-used-coq-emacs-versions index 8f9b1c0cd..2ccedee92 100644 --- a/ci/doc/currently-used-coq-emacs-versions +++ b/ci/doc/currently-used-coq-emacs-versions @@ -2,26 +2,22 @@ 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 -coq-8.11.2-emacs-29.3 +coq-8.11.2-emacs-29.4 coq-8.12.2-emacs-26.3 coq-8.12.2-emacs-27.1 -coq-8.12.2-emacs-29.3 +coq-8.12.2-emacs-29.4 coq-8.13.2-emacs-26.3 coq-8.13.2-emacs-27.1 coq-8.13.2-emacs-27.2 -coq-8.13.2-emacs-29.3 +coq-8.13.2-emacs-29.4 coq-8.14.1-emacs-26.3 coq-8.14.1-emacs-27.1 coq-8.14.1-emacs-27.2 -coq-8.14.1-emacs-29.3 +coq-8.14.1-emacs-29.4 coq-8.15.2-emacs-26.3 coq-8.15.2-emacs-27.1 -coq-8.15.2-emacs-27.2 coq-8.15.2-emacs-28.1 -coq-8.15.2-emacs-28.2 -coq-8.15.2-emacs-29.1 -coq-8.15.2-emacs-29.2 -coq-8.15.2-emacs-29.3 +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 @@ -30,6 +26,7 @@ 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 coq-8.17.1-emacs-27.2 @@ -38,6 +35,7 @@ coq-8.17.1-emacs-28.2 coq-8.17.1-emacs-29.1 coq-8.17.1-emacs-29.2 coq-8.17.1-emacs-29.3 +coq-8.17.1-emacs-29.4 coq-8.18.0-emacs-26.3 coq-8.18.0-emacs-27.1 coq-8.18.0-emacs-27.2 @@ -46,11 +44,13 @@ coq-8.18.0-emacs-28.2 coq-8.18.0-emacs-29.1 coq-8.18.0-emacs-29.2 coq-8.18.0-emacs-29.3 -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 -coq-8.19.1-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-27.2 +coq-8.19.2-emacs-28.1 +coq-8.19.2-emacs-28.2 +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 diff --git a/ci/doc/currently-used-coq-nix-versions b/ci/doc/currently-used-coq-nix-versions index b61d15b60..e68fb6356 100644 --- a/ci/doc/currently-used-coq-nix-versions +++ b/ci/doc/currently-used-coq-nix-versions @@ -9,4 +9,4 @@ 8.16.1 8.17.1 8.18.0 -8.19.1 +8.19.2