Merge pull request #357 from MSoegtropIMC/2023.03-finalise-1

2023.03 finalise 1
coq · Aug 22, 2023 · a6aac64 · a6aac64
2 parents c20c44b + ed9c917
commit a6aac64
Show file tree

Hide file tree

Showing 43 changed files with 5,583 additions and 307 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -50,7 +50,7 @@ jobs:
       fail-fast: false
       matrix:
         variant:
-          - '8.17~2023.03+beta1'
+          - '8.17~2023.08'
           - '8.16~2022.09'
 
     steps:
@@ -137,7 +137,7 @@ jobs:
       fail-fast: false
       matrix:
         variant:
-          - '8.17~2023.03+beta1'
+          - '8.17~2023.08'
           - '8.16~2022.09'
 
     steps:

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -28,7 +28,7 @@ on:
         default: '-extent=x -parallel=p -jobs=2 -large=i -compcert=y -unimath=n -set-switch=y'
       snap_pick:
         description: 'Package pick for the snap package:'
-        default: 8.17~2023.03+beta1
+        default: 8.17~2023.08
       upload:
         description: 'Upload artifact to Snap Store? (true/false, default false)'
         default: false
@@ -39,7 +39,7 @@ on:
 env:
   PLATFORM: -extent=x -parallel=p -jobs=2 -large=i -compcert=y -unimath=n -set-switch=y
   COQREGTESTING: y
-  SNAP_PICK: 8.17~2023.03+beta1
+  SNAP_PICK: 8.17~2023.08
 
 
 ###############################################################################
@@ -58,7 +58,7 @@ jobs:
       matrix:
         variant:
           # This should contain all picks introduced in the current release + all original picks of all Coq versions
-          - '8.17~2023.03+beta1'
+          - '8.17~2023.08'
           - '8.16~2022.09'
           - '8.15~2022.09'
           - '8.15~2022.04'

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -52,7 +52,7 @@ jobs:
           - '32'
         variant:
           # Keep this in sync with the Smoke test below
-          - '8.17~2023.03+beta1'
+          - '8.17~2023.08'
           - '8.16~2022.09'
 
     steps:
@@ -105,7 +105,7 @@ jobs:
           - '64'
           - '32'
         variant:
-          - '8.17~2023.03+beta1'
+          - '8.17~2023.08'
           - '8.16~2022.09'
 
     steps:

diff --git a/README.md b/README.md
@@ -34,6 +34,8 @@ The table below contains links to the README files for the supported versions
 of Coq and libraries. Each README file contains a list of included packages with
 detailed information for each package.
 
+- [Coq 8.17.1 (released Jun 2023) with the first package pick from Aug 2023](doc/README~8.17~2023.08.md)
+- [Coq 8.16.1 (released Nov 2022) with an updated package pick from Aug 2023](doc/README~8.16~2023.08.md)
 - [Coq 8.16.1 (released Nov 2022) with the first package pick from Sep 2022](doc/README~8.16~2022.09.md)
 - [Coq 8.15.2 (released Jun 2022) with an updated package pick from Sep 2022](doc/README~8.15~2022.09.md)
 - [Coq 8.15.2 (released Jun 2022) with the first package pick from Apr 2022](doc/README~8.15~2022.04.md)
@@ -72,6 +74,14 @@ The Coq Platform team does no double check this information.
 
 <details><summary><font size="+1">Release notes / changelog</font></summary>
 
+## Changes in 2023.03.0
+
+- Added new picks 8.17~2023.08 and 8.16~2023.08
+- coq-ott has been removed on Windows, since version 0.33 has issues there - if you need coq-ott we recommend to install version 0.32 via opam on Windows
+- coq-fiat-crypto has been removed on Windows, since version 0.0.20 results in a stack overflows - there is no good work around for this - we recommend to use the previous pick 8.16~2022.09 
+
+Please see the [Pick Readme](doc/README~8.17~2023.08.md) for details on the package list.
+
 ## Changes in 2022.09.1
 
 - Changed picks 8.16~2022.09 and 8.15~2022.09 from beta to release
@@ -228,25 +238,27 @@ Each Coq version you install via the Coq Platform scripts will create a separate
 You can list the available switches with:
 ```
 ~$ opam switch
-#   switch                                 compiler                                              description
-    __coq-platform.2022.09.1~8.12          ocaml-base-compiler.4.10.2                            Coq 8.12.2 (released Dec 2020) with the first package pick from Dec 2020
-    __coq-platform.2022.09.1~8.13~2021.02  ocaml-base-compiler.4.10.2                            Coq 8.13.2 (released Apr 2021) with the first package pick from Feb 2021
-    __coq-platform.2022.09.1~8.13~2021.09  ocaml-base-compiler.4.10.2                            Coq 8.13.2 (released Apr 2021) with an extended package pick from Sep 2021
-    __coq-platform.2022.09.1~8.13~2022.01  ocaml-base-compiler.4.10.2                            Coq 8.13.2 (released Apr 2021) with an updated package pick from Jan 2022
-    __coq-platform.2022.09.1~8.14~2022.01  ocaml-option-flambda.1,ocaml-variants.4.12.1+options  Coq 8.14.1 (released Nov 2021) with the first package pick from Jan 2022
-    __coq-platform.2022.09.1~8.14~2022.04  ocaml-option-flambda.1,ocaml-variants.4.12.1+options  Coq 8.14.1 (released Nov 2021) with an updated package pick from Apr 2022
-    __coq-platform.2022.09.1~8.15~2022.04  ocaml-option-flambda.1,ocaml-variants.4.13.1+options  Coq 8.15.2 (released Jun 2022) with the first package pick from Apr 2022
-->  __coq-platform.2022.09.1~dev           ocaml-option-flambda.1,ocaml-variants.4.12.1+options  Coq dev (latest master of all packages)
+#   switch                     compiler                                              description
+    CP.2023.03.0~8.12          ocaml-base-compiler.4.10.2                            Coq 8.12.2 (released Dec 2020) with the first package pick from Dec 2020
+    CP.2023.03.0~8.13~2021.02  ocaml-base-compiler.4.10.2                            Coq 8.13.2 (released Apr 2021) with the first package pick from Feb 2021
+    CP.2023.03.0~8.13~2021.09  ocaml-base-compiler.4.10.2                            Coq 8.13.2 (released Apr 2021) with an extended package pick from Sep 2021
+    CP.2023.03.0~8.13~2022.01  ocaml-base-compiler.4.10.2                            Coq 8.13.2 (released Apr 2021) with an updated package pick from Jan 2022
+    CP.2023.03.0~8.14~2022.01  ocaml-option-flambda.1,ocaml-variants.4.12.1+options  Coq 8.14.1 (released Nov 2021) with the first package pick from Jan 2022
+    CP.2023.03.0~8.14~2022.04  ocaml-option-flambda.1,ocaml-variants.4.12.1+options  Coq 8.14.1 (released Nov 2021) with an updated package pick from Apr 2022
+    CP.2023.03.0~8.15~2022.04  ocaml-option-flambda.1,ocaml-variants.4.13.1+options  Coq 8.15.2 (released Jun 2022) with the first package pick from Apr 2022
+    CP.2023.03.0~8.16~2022.09  ocaml-option-flambda.1,ocaml-variants.4.13.1+options  Coq 8.16.1 (released Nov 2022) with the first package pick from Sep 2022
+->  CP.2023.03.0~8.17~2023.08  ocaml-option-flambda.1,ocaml-variants.4.14.1+options  Coq 8.17.1 (released Jun 2023) with the first package pick from Aug 2023
+    CP.2023.03.0~dev           ocaml-option-flambda.1,ocaml-variants.4.12.1+options  Coq dev (latest master of all packages)
 ```
 
 You can select the opam switch for **all shells** with e.g.:
 ```
-~$ opam switch __coq-platform.2022.09.1~8.16~2022.09
+~$ opam switch CP.2023.03.0~8.17~2023.08
 ```
 
 You can select the opam switch for **just the current shell** with e.g.:
 ```
-eval $(opam config env --set-switch --switch __coq-platform.2022.09.1~8.16~2022.09)
+eval $(opam config env --set-switch --switch CP.2023.03.0~8.17~2023.08)
 ```
 
 So you can easily open two separate shell windows, select different opam switches and start e.g. two CoqIDE instances to step through the same file with two different versions of Coq.
@@ -285,18 +297,21 @@ Please clarify the license at [CompCert License](https://github.com/AbsInt/CompC
     ```
     ~$ opam switch
     #   switch                                 compiler                                              description
-        __coq-platform.2022.09.1~8.12          ocaml-base-compiler.4.10.2                            Coq 8.12.2 (released Dec 2020) with the first package pick from Dec 2020
-        __coq-platform.2022.09.1~8.13~2021.02  ocaml-base-compiler.4.10.2                            Coq 8.13.2 (released Apr 2021) with the first package pick from Feb 2021
-        __coq-platform.2022.09.1~8.13~2021.09  ocaml-base-compiler.4.10.2                            Coq 8.13.2 (released Apr 2021) with an extended package pick from Sep 2021
-        __coq-platform.2022.09.1~8.13~2022.01  ocaml-base-compiler.4.10.2                            Coq 8.13.2 (released Apr 2021) with an updated package pick from Jan 2022
-        __coq-platform.2022.09.1~8.14~2022.01  ocaml-option-flambda.1,ocaml-variants.4.12.1+options  Coq 8.14.1 (released Nov 2021) with the first package pick from Jan 2022
-        __coq-platform.2022.09.1~8.14~2022.04  ocaml-option-flambda.1,ocaml-variants.4.12.1+options  Coq 8.14.1 (released Nov 2021) with an updated package pick from Apr 2022
-        __coq-platform.2022.09.1~8.15~2022.04  ocaml-option-flambda.1,ocaml-variants.4.13.1+options  Coq 8.15.2 (released Jun 2022) with the first package pick from Apr 2022
-    ->  __coq-platform.2022.09.1~dev           ocaml-option-flambda.1,ocaml-variants.4.12.1+options  Coq dev (latest master of all packages)
+#   switch                     compiler                                              description
+    CP.2023.03.0~8.12          ocaml-base-compiler.4.10.2                            Coq 8.12.2 (released Dec 2020) with the first package pick from Dec 2020
+    CP.2023.03.0~8.13~2021.02  ocaml-base-compiler.4.10.2                            Coq 8.13.2 (released Apr 2021) with the first package pick from Feb 2021
+    CP.2023.03.0~8.13~2021.09  ocaml-base-compiler.4.10.2                            Coq 8.13.2 (released Apr 2021) with an extended package pick from Sep 2021
+    CP.2023.03.0~8.13~2022.01  ocaml-base-compiler.4.10.2                            Coq 8.13.2 (released Apr 2021) with an updated package pick from Jan 2022
+    CP.2023.03.0~8.14~2022.01  ocaml-option-flambda.1,ocaml-variants.4.12.1+options  Coq 8.14.1 (released Nov 2021) with the first package pick from Jan 2022
+    CP.2023.03.0~8.14~2022.04  ocaml-option-flambda.1,ocaml-variants.4.12.1+options  Coq 8.14.1 (released Nov 2021) with an updated package pick from Apr 2022
+    CP.2023.03.0~8.15~2022.04  ocaml-option-flambda.1,ocaml-variants.4.13.1+options  Coq 8.15.2 (released Jun 2022) with the first package pick from Apr 2022
+    CP.2023.03.0~8.16~2022.09  ocaml-option-flambda.1,ocaml-variants.4.13.1+options  Coq 8.16.1 (released Nov 2022) with the first package pick from Sep 2022
+->  CP.2023.03.0~8.17~2023.08  ocaml-option-flambda.1,ocaml-variants.4.14.1+options  Coq 8.17.1 (released Jun 2023) with the first package pick from Aug 2023
+    CP.2023.03.0~dev           ocaml-option-flambda.1,ocaml-variants.4.12.1+options  Coq dev (latest master of all packages)
     ```
 - Choose the switch you want to change with this command (example):
     ```
-    opam switch __coq-platform.2022.09.1
+    opam switch CP.2023.03.0~8.17~2023.08
     eval $(opam env)
     ```
 - You can find packages with `opam list --all | grep "some keyword"`.

diff --git a/doc/FAQ-customized-installers.md b/doc/FAQ-customized-installers.md
@@ -51,7 +51,7 @@ If you have issues, please contact us on zulip chat [Coq-Platform & users](https
 
 After you created and built a new package pick, you can create a macOS DMG installer from it as follows:
 
-- Activate the opam switch with `opam switch __coq-platform.2022.09.1~my_new_pick`
+- Activate the opam switch with `opam switch CP.2023.03.0~my_new_pick`
 - Navigate to your Coq Platform git folder, e.g. `cd ~/platform`
 - Run `macos/create_installer_macos.sh -sign=Y -signcert=path_to_certificate_file -signid=signature_id`
 - Above the `path_to_certificate_file` is the path and name of the `.cer` and `.p12` file **without** the file extension. The signature ID is typically the name of the institution to which the certificate is issued.
@@ -76,7 +76,7 @@ After you created a new package pick, you can create a Snap package from it as f
 After you created and built a new package pick, you can create a Windows installer from it as follows:
 
 - Open the Coq Platform cygwin shell, e.g. `C:\bin\cygwin64_coq_platform\cygwin.bat`.
-- Activate the opam switch with `opam switch __coq-platform.2022.09.1~my_new_pick`
+- Activate the opam switch with `opam switch CP.2023.03.0~my_new_pick`
 - Navigate to the `coq-platform` folder.
 - Run `windows/create_installer_windows.sh`