Skip to content

Commit a6aac64

Browse files
authored
Merge pull request #357 from MSoegtropIMC/2023.03-finalise-1
2023.03 finalise 1
2 parents c20c44b + ed9c917 commit a6aac64

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+5583
-307
lines changed

.github/workflows/macos.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
fail-fast: false
5151
matrix:
5252
variant:
53-
- '8.17~2023.03+beta1'
53+
- '8.17~2023.08'
5454
- '8.16~2022.09'
5555

5656
steps:
@@ -137,7 +137,7 @@ jobs:
137137
fail-fast: false
138138
matrix:
139139
variant:
140-
- '8.17~2023.03+beta1'
140+
- '8.17~2023.08'
141141
- '8.16~2022.09'
142142

143143
steps:

.github/workflows/ubuntu.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ on:
2828
default: '-extent=x -parallel=p -jobs=2 -large=i -compcert=y -unimath=n -set-switch=y'
2929
snap_pick:
3030
description: 'Package pick for the snap package:'
31-
default: 8.17~2023.03+beta1
31+
default: 8.17~2023.08
3232
upload:
3333
description: 'Upload artifact to Snap Store? (true/false, default false)'
3434
default: false
@@ -39,7 +39,7 @@ on:
3939
env:
4040
PLATFORM: -extent=x -parallel=p -jobs=2 -large=i -compcert=y -unimath=n -set-switch=y
4141
COQREGTESTING: y
42-
SNAP_PICK: 8.17~2023.03+beta1
42+
SNAP_PICK: 8.17~2023.08
4343

4444

4545
###############################################################################
@@ -58,7 +58,7 @@ jobs:
5858
matrix:
5959
variant:
6060
# This should contain all picks introduced in the current release + all original picks of all Coq versions
61-
- '8.17~2023.03+beta1'
61+
- '8.17~2023.08'
6262
- '8.16~2022.09'
6363
- '8.15~2022.09'
6464
- '8.15~2022.04'

.github/workflows/windows.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
- '32'
5353
variant:
5454
# Keep this in sync with the Smoke test below
55-
- '8.17~2023.03+beta1'
55+
- '8.17~2023.08'
5656
- '8.16~2022.09'
5757

5858
steps:
@@ -105,7 +105,7 @@ jobs:
105105
- '64'
106106
- '32'
107107
variant:
108-
- '8.17~2023.03+beta1'
108+
- '8.17~2023.08'
109109
- '8.16~2022.09'
110110

111111
steps:

README.md

+35-20
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ The table below contains links to the README files for the supported versions
3434
of Coq and libraries. Each README file contains a list of included packages with
3535
detailed information for each package.
3636

37+
- [Coq 8.17.1 (released Jun 2023) with the first package pick from Aug 2023](doc/README~8.17~2023.08.md)
38+
- [Coq 8.16.1 (released Nov 2022) with an updated package pick from Aug 2023](doc/README~8.16~2023.08.md)
3739
- [Coq 8.16.1 (released Nov 2022) with the first package pick from Sep 2022](doc/README~8.16~2022.09.md)
3840
- [Coq 8.15.2 (released Jun 2022) with an updated package pick from Sep 2022](doc/README~8.15~2022.09.md)
3941
- [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.
7274

7375
<details><summary><font size="+1">Release notes / changelog</font></summary>
7476

77+
## Changes in 2023.03.0
78+
79+
- Added new picks 8.17~2023.08 and 8.16~2023.08
80+
- 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
81+
- 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
82+
83+
Please see the [Pick Readme](doc/README~8.17~2023.08.md) for details on the package list.
84+
7585
## Changes in 2022.09.1
7686

7787
- 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
228238
You can list the available switches with:
229239
```
230240
~$ opam switch
231-
# switch compiler description
232-
__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
233-
__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
234-
__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
235-
__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
236-
__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
237-
__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
238-
__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
239-
-> __coq-platform.2022.09.1~dev ocaml-option-flambda.1,ocaml-variants.4.12.1+options Coq dev (latest master of all packages)
241+
# switch compiler description
242+
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
243+
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
244+
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
245+
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
246+
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
247+
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
248+
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
249+
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
250+
-> 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
251+
CP.2023.03.0~dev ocaml-option-flambda.1,ocaml-variants.4.12.1+options Coq dev (latest master of all packages)
240252
```
241253

242254
You can select the opam switch for **all shells** with e.g.:
243255
```
244-
~$ opam switch __coq-platform.2022.09.1~8.16~2022.09
256+
~$ opam switch CP.2023.03.0~8.17~2023.08
245257
```
246258

247259
You can select the opam switch for **just the current shell** with e.g.:
248260
```
249-
eval $(opam config env --set-switch --switch __coq-platform.2022.09.1~8.16~2022.09)
261+
eval $(opam config env --set-switch --switch CP.2023.03.0~8.17~2023.08)
250262
```
251263

252264
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
285297
```
286298
~$ opam switch
287299
# switch compiler description
288-
__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
289-
__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
290-
__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
291-
__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
292-
__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
293-
__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
294-
__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
295-
-> __coq-platform.2022.09.1~dev ocaml-option-flambda.1,ocaml-variants.4.12.1+options Coq dev (latest master of all packages)
300+
# switch compiler description
301+
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
302+
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
303+
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
304+
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
305+
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
306+
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
307+
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
308+
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
309+
-> 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
310+
CP.2023.03.0~dev ocaml-option-flambda.1,ocaml-variants.4.12.1+options Coq dev (latest master of all packages)
296311
```
297312
- Choose the switch you want to change with this command (example):
298313
```
299-
opam switch __coq-platform.2022.09.1
314+
opam switch CP.2023.03.0~8.17~2023.08
300315
eval $(opam env)
301316
```
302317
- You can find packages with `opam list --all | grep "some keyword"`.

doc/FAQ-customized-installers.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ If you have issues, please contact us on zulip chat [Coq-Platform & users](https
5151

5252
After you created and built a new package pick, you can create a macOS DMG installer from it as follows:
5353

54-
- Activate the opam switch with `opam switch __coq-platform.2022.09.1~my_new_pick`
54+
- Activate the opam switch with `opam switch CP.2023.03.0~my_new_pick`
5555
- Navigate to your Coq Platform git folder, e.g. `cd ~/platform`
5656
- Run `macos/create_installer_macos.sh -sign=Y -signcert=path_to_certificate_file -signid=signature_id`
5757
- 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
7676
After you created and built a new package pick, you can create a Windows installer from it as follows:
7777

7878
- Open the Coq Platform cygwin shell, e.g. `C:\bin\cygwin64_coq_platform\cygwin.bat`.
79-
- Activate the opam switch with `opam switch __coq-platform.2022.09.1~my_new_pick`
79+
- Activate the opam switch with `opam switch CP.2023.03.0~my_new_pick`
8080
- Navigate to the `coq-platform` folder.
8181
- Run `windows/create_installer_windows.sh`
8282

0 commit comments

Comments
 (0)