CI: add Coq 8.20+rc1

This update required a number of manual fixes, because cipg is not yet able to generate the right container tags for rc versions.
hendriktews · Jul 6, 2024 · 90ed547 · 90ed547
1 parent 837f587
commit 90ed547
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 5 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -140,6 +140,15 @@ jobs:
           - coq-8.19.2-emacs-29.2
           - coq-8.19.2-emacs-29.3
           - coq-8.19.2-emacs-29.4
+          - coq-8.20-rc1-emacs-26.3
+          - coq-8.20-rc1-emacs-27.1
+          - coq-8.20-rc1-emacs-27.2
+          - coq-8.20-rc1-emacs-28.1
+          - coq-8.20-rc1-emacs-28.2
+          - coq-8.20-rc1-emacs-29.1
+          - coq-8.20-rc1-emacs-29.2
+          - coq-8.20-rc1-emacs-29.3
+          - coq-8.20-rc1-emacs-29.4
           # CIPG change marker end
       # don't cancel all in-progress jobs if one matrix job fails:
       fail-fast: false
@@ -213,6 +222,15 @@ jobs:
           - coq-8.19.2-emacs-29.2
           - coq-8.19.2-emacs-29.3
           - coq-8.19.2-emacs-29.4
+          - coq-8.20-rc1-emacs-26.3
+          - coq-8.20-rc1-emacs-27.1
+          - coq-8.20-rc1-emacs-27.2
+          - coq-8.20-rc1-emacs-28.1
+          - coq-8.20-rc1-emacs-28.2
+          - coq-8.20-rc1-emacs-29.1
+          - coq-8.20-rc1-emacs-29.2
+          - coq-8.20-rc1-emacs-29.3
+          - coq-8.20-rc1-emacs-29.4
           # CIPG change marker end
       # don't cancel all in-progress jobs if one matrix job fails:
       fail-fast: false
@@ -282,6 +300,15 @@ jobs:
           - coq-8.19.2-emacs-29.2
           - coq-8.19.2-emacs-29.3
           - coq-8.19.2-emacs-29.4
+          - coq-8.20-rc1-emacs-26.3
+          - coq-8.20-rc1-emacs-27.1
+          - coq-8.20-rc1-emacs-27.2
+          - coq-8.20-rc1-emacs-28.1
+          - coq-8.20-rc1-emacs-28.2
+          - coq-8.20-rc1-emacs-29.1
+          - coq-8.20-rc1-emacs-29.2
+          - coq-8.20-rc1-emacs-29.3
+          - coq-8.20-rc1-emacs-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
@@ -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 -->
-56
+65
 <!-- CIPG change marker end -->
 containers.
 
@@ -189,6 +189,7 @@ containers.
 |  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.20rc |      |      |   RC |   RC |   RC |   RC |   RC |   RC |   RC |   RC |   RC |
 <!-- CIPG change marker end -->
 
 In the table above,
@@ -285,7 +286,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 -->
-32
+41
 <!-- CIPG change marker end -->
 version pairs for the Proof General interaction tests with Coq.
 
@@ -306,6 +307,7 @@ version pairs for the Proof General interaction tests with Coq.
 |  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  |
+|  8.20rc |      |      |   RC |   RC |   RC |   RC |   RC |   RC |   RC |   RC |   RC |
 <!-- CIPG change marker end -->
 
 See [Container build strategy](#contbuild) for an explanation of the
@@ -315,7 +317,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 -->
-125
+152
 <!-- CIPG change marker end -->
 github checks.
 

diff --git 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.20rc |       |                   |          |          |
 | 2024/06 | 8.19.2 |  29.4 |                   |          |          |
 | 2024/03 | 8.19.1 |  29.3 |                   |          |          |
 | 2024/01 | 8.19.0 |  29.2 |                   |          |          |

diff --git a/ci/doc/currently-used-coq-emacs-versions b/ci/doc/currently-used-coq-emacs-versions
@@ -54,3 +54,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-rc1-emacs-26.3
+coq-8.20-rc1-emacs-27.1
+coq-8.20-rc1-emacs-27.2
+coq-8.20-rc1-emacs-28.1
+coq-8.20-rc1-emacs-28.2
+coq-8.20-rc1-emacs-29.1
+coq-8.20-rc1-emacs-29.2
+coq-8.20-rc1-emacs-29.3
+coq-8.20-rc1-emacs-29.4
diff --git a/ci/doc/currently-used-coq-nix-versions b/ci/doc/currently-used-coq-nix-versions
@@ -10,3 +10,4 @@
 8.17.1
 8.18.0
 8.19.2
+8.20rc
diff --git a/ci/tools/cipg.ml b/ci/tools/cipg.ml
@@ -1008,7 +1008,7 @@ let rec read_nix_containers inc nix_conts =
        (match scan_version line with
           | None -> assert false
           | Some v ->
-             if v.patch <> None
+             if v.release_candidate || v.patch <> None
              then read_nix_containers inc (v :: nix_conts)
              else read_nix_containers inc nix_conts
        )
@@ -1076,7 +1076,7 @@ let rec read_all_coq_emacs_tags inc coq_emacs =
     | line ->
        let (coq_v, emacs_v) as vp = read_coq_emacs_tag line in
        let coq_emacs =
-         if coq_v.patch <> None
+         if coq_v.release_candidate || coq_v.patch <> None
          then vp :: coq_emacs
          else coq_emacs
        in