Skip to content

Commit 5d6bc01

Browse files
authored
Merge pull request #205 from MSoegtropIMC/2022.01.prep7
Prepare release 2022.01, step 7
2 parents 18992d8 + 7e7a284 commit 5d6bc01

File tree

34 files changed

+130
-1753
lines changed

34 files changed

+130
-1753
lines changed

.github/workflows/macos.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
matrix:
5050
variant:
5151
- '8.14~2022.01'
52-
- '8.13~2022.01'
52+
- '8.15~beta1'
5353

5454
steps:
5555
- name: Git checkout
@@ -124,7 +124,7 @@ jobs:
124124
matrix:
125125
variant:
126126
- '8.14~2022.01'
127-
- '8.13~2022.01'
127+
- '8.15~beta1'
128128

129129
steps:
130130
- name: Install bash

.github/workflows/ubuntu.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
- '8.14~2022.01'
5353
- '8.13~2022.01'
5454
- '8.12'
55-
- '8.15~preview1'
55+
- '8.15~beta1'
5656
- 'dev'
5757

5858
steps:

.github/workflows/windows.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
variant:
5656
# Keep this in sync with the Smoke test below
5757
- '8.14~2022.01'
58-
- '8.15~preview1'
58+
- '8.15~beta1'
5959

6060
steps:
6161
- name: Set git to use LF
@@ -108,7 +108,7 @@ jobs:
108108
- '64'
109109
variant:
110110
- '8.14~2022.01'
111-
- '8.15~preview1'
111+
- '8.15~beta1'
112112

113113
steps:
114114
- name: 'Download Artifact'

README.md

+15-10
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ detailed information for each package.
3939
- [Coq 8.13.2 (released Apr 2021) with an updated package pick from Sep 2021](doc/README~8.13~2021.09.md)
4040
- [Coq 8.13.2 (released Apr 2021) with original package pick from Feb 2021](doc/README~8.13~2021.02.md)
4141
- [Coq 8.12.2 (released Dec 2020)](doc/README~8.12.md)
42-
- [Coq 8.15.0 (released Jan 2022) with a preview (still incomplete) package pick](doc/README~8.15~preview1.md)
42+
- [Coq 8.15.0 (released Jan 2022) with a beta package pick](doc/README~8.15~beta1.md)
4343
- [Coq Developer (latest developer branch)](doc/README~dev.md)
4444

4545
If you have questions on the Coq Platform, please contact us on zulip chat [Coq-Platform & users](https://coq.zulipchat.com/#narrow/stream/250632-Coq-Platform.20devs.20.26.20users)
@@ -72,8 +72,10 @@ The Coq Platform team does no double check this information.
7272
## Changes in 2022.01.0
7373

7474
- release package pick for Coq 8.14.0 + updated mostly compatible package pick for Coq 8.13.2
75-
- preview package pick for Coq 8.15.0
75+
- beta package pick for Coq 8.15.0
76+
- added coq-hammer (not on Windows) including the provers `z3` and `eprover`
7677
- added prime number certificate generator `coq-coqprime-generator` including `gmp-ecm`
78+
- disabled QuickChick on Windows (it did not really work on Windows - we try to make it work in the next release)
7779

7880
## Changes in 2021.09.0
7981

@@ -155,7 +157,7 @@ You can list the available switches with:
155157
__coq-platform.2022.01.0~8.13~2021.09 ocaml-base-compiler.4.10.2 __coq-platform.2022.01.0~8.13~2021.09
156158
__coq-platform.2022.01.0~8.13~2022.01 ocaml-base-compiler.4.10.2 __coq-platform.2022.01.0~8.13~2022.01
157159
__coq-platform.2022.01.0~8.14~2022.01 ocaml-base-compiler.4.10.2 __coq-platform.2022.01.0~8.14~2022.01
158-
__coq-platform.2022.01.0~8.15~preview1 ocaml-base-compiler.4.10.2 __coq-platform.2022.01.0~8.15~preview1
160+
__coq-platform.2022.01.0~8.15~beta1 ocaml-base-compiler.4.10.2 __coq-platform.2022.01.0~8.15~beta1
159161
-> __coq-platform.2022.01.0~dev ocaml-base-compiler.4.10.2 __coq-platform.2022.01.0~dev
160162
```
161163

@@ -203,16 +205,19 @@ Please clarify the license at [CompCert License](https://github.com/AbsInt/CompC
203205
- On Linux or macOS open a shell in the usual way.
204206
- Run the command `opam switch` which will show the list of available switches:
205207
```
206-
# switch compiler description
207-
__coq-platform.2021.09.0~8.12 ocaml-base-compiler.4.10.0 __coq-platform.2021.09.0~8.12
208-
__coq-platform.2021.09.0~8.13 ocaml-base-compiler.4.10.0 __coq-platform.2021.09.0~8.13
209-
__coq-platform.2021.09.0~8.13~2021.02 ocaml-base-compiler.4.10.0 __coq-platform.2021.09.0~8.13~2021.02
210-
-> __coq-platform.2021.09.0~8.14+beta2 ocaml-base-compiler.4.10.0 __coq-platform.2021.09.0~8.14+beta2
211-
_coq-platform_.2021.02.1 ocaml-base-compiler.4.07.1 _coq-platform_.2021.02.1
208+
~$ opam switch
209+
# switch compiler description
210+
__coq-platform.2022.01.0~8.12 ocaml-base-compiler.4.10.2 __coq-platform.2022.01.0~8.12
211+
__coq-platform.2022.01.0~8.13~2021.02 ocaml-base-compiler.4.10.2 __coq-platform.2022.01.0~8.13~2021.02
212+
__coq-platform.2022.01.0~8.13~2021.09 ocaml-base-compiler.4.10.2 __coq-platform.2022.01.0~8.13~2021.09
213+
__coq-platform.2022.01.0~8.13~2022.01 ocaml-base-compiler.4.10.2 __coq-platform.2022.01.0~8.13~2022.01
214+
__coq-platform.2022.01.0~8.14~2022.01 ocaml-base-compiler.4.10.2 __coq-platform.2022.01.0~8.14~2022.01
215+
__coq-platform.2022.01.0~8.15~beta1 ocaml-base-compiler.4.10.2 __coq-platform.2022.01.0~8.15~beta1
216+
-> __coq-platform.2022.01.0~dev ocaml-base-compiler.4.10.2 __coq-platform.2022.01.0~dev
212217
```
213218
- Choose the switch you want to change with this command (example):
214219
```
215-
opam switch __coq-platform.2021.09.0~8.13
220+
opam switch __coq-platform.2022.01.0~8.14~2022.01
216221
eval $(opam env)
217222
```
218223
- You can find packages with `opam list --all | grep "some keyword"`.

doc/PackageTable~8.15~preview1.csv doc/PackageTable~8.15~beta1.csv

+7-6
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,17 @@ package,version,license,level
2323
"coq-iris","3.6.0","https://spdx.org/licenses/BSD-3-Clause.html","full"
2424
"coq-libhyps","2.0.4","https://spdx.org/licenses/MIT.html","full"
2525
"coq-math-classes","8.15.0","https://spdx.org/licenses/MIT.html","full"
26-
"coq-mathcomp-algebra","1.13.0","https://spdx.org/licenses/CECILL-B.html","full"
26+
"coq-mathcomp-algebra","1.14.0","https://spdx.org/licenses/CECILL-B.html","full"
27+
"coq-mathcomp-analysis","0.3.13","https://spdx.org/licenses/CECILL-C.html","full"
2728
"coq-mathcomp-bigenough","1.0.1","https://spdx.org/licenses/CECILL-B.html","full"
28-
"coq-mathcomp-character","1.13.0","https://spdx.org/licenses/CECILL-B.html","full"
29-
"coq-mathcomp-field","1.13.0","https://spdx.org/licenses/CECILL-B.html","full"
30-
"coq-mathcomp-fingroup","1.13.0","https://spdx.org/licenses/CECILL-B.html","full"
29+
"coq-mathcomp-character","1.14.0","https://spdx.org/licenses/CECILL-B.html","full"
30+
"coq-mathcomp-field","1.14.0","https://spdx.org/licenses/CECILL-B.html","full"
31+
"coq-mathcomp-fingroup","1.14.0","https://spdx.org/licenses/CECILL-B.html","full"
3132
"coq-mathcomp-finmap","1.5.1","https://spdx.org/licenses/CECILL-B.html","full"
3233
"coq-mathcomp-multinomials","1.5.5","https://spdx.org/licenses/CECILL-B.html","full"
3334
"coq-mathcomp-real-closed","1.1.2","https://spdx.org/licenses/CECILL-B.html","full"
34-
"coq-mathcomp-solvable","1.13.0","https://spdx.org/licenses/CECILL-B.html","full"
35-
"coq-mathcomp-ssreflect","1.13.0","https://spdx.org/licenses/CECILL-B.html","full"
35+
"coq-mathcomp-solvable","1.14.0","https://spdx.org/licenses/CECILL-B.html","full"
36+
"coq-mathcomp-ssreflect","1.14.0","https://spdx.org/licenses/CECILL-B.html","full"
3637
"coq-mathcomp-zify","1.2.0+1.12+8.13","https://spdx.org/licenses/CECILL-B.html","full"
3738
"coq-menhirlib","20211230","https://spdx.org/licenses/LGPL-3.0-or-later.html","full"
3839
"coq-mtac2","1.4+8.15","https://spdx.org/licenses/MIT.html","full"

doc/README_Linux.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,15 @@ This method is intended for experienced users, who may want to use opam to insta
7979
- OpenSuse: sudo zypper in -t pattern devel_C_C++
8080
- For CentOS and possibly RHEL some additional steps are required, see [CentOS](#centos) below.
8181
- Get the Coq Platform scripts via either of these methods
82-
- Most users should download and extract `https://github.com/coq/platform/archive/refs/tags/2021.09.0.zip`.
83-
- Users which intend to contribute to Coq Platform should use `git clone --branch 2021.09.0 https://github.com/coq/platform.git`.
82+
- Most users should download and extract `https://github.com/coq/platform/archive/refs/tags/2022.01.0.zip`.
83+
- Users which intend to contribute to Coq Platform should use `git clone --branch 2022.01.0 https://github.com/coq/platform.git`.
8484
- Open a shell, navigate to the download folder and execute `coq_platform_make.sh`.
8585
- The system will ask for sudo permissions to install prerequisites *several times* so the script is not fully unattended but all installations of dependencies are done directly after the initialization of the opam switch.
8686
- In case the script aborts e.g. cause of internet issues, just rerun the script.
87-
- The script creates a new opam switch named e.g. __coq-platform.2021.09.0~8.13 - the exact name depends on the Coq version and package pick you selected.
87+
- The script creates a new opam switch named e.g. __coq-platform.2022.01.0~8.14~2022.01 - the exact name depends on the Coq version and package pick you selected.
8888
This means the script does not touch your existing opam setup unless you already have a switch of this name.
8989
- Use the following commands to activate this switch after opening a new shell:
90-
- `opam switch __coq-platform.2021.09.0~8.13` (note: the switch name might vary if you choose a different version of Coq - please use `opam switch` to see a list of switch names)
90+
- `opam switch __coq-platform.2022.01.0~8.14~2022.01` (note: the switch name might vary if you choose a different version of Coq - please use `opam switch` to see a list of switch names)
9191
- `eval $(opam env)`
9292
- The second step can be automated by rerunning `opam init`
9393
- The main opam repositories for Coq and OCaml developments are already added to the created opam switch, so it should be easy to install additional Coq (or OCaml) packages.

doc/README_Windows.md

+9-9
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ This method is intended for experienced users, who may want to use opam to insta
1919

2020
- In case you install **Coq Platform for the first time**:
2121
- Get the Coq Platform scripts via either of these methods
22-
- Most users should download and extract `https://github.com/coq/platform/archive/refs/tags/2021.09.0.zip`.
23-
- Users which intend to contribute to Coq Platform should use `git clone --branch 2021.09.0 https://github.com/coq/platform.git`.
22+
- Most users should download and extract `https://github.com/coq/platform/archive/refs/tags/2022.01.0.zip`.
23+
- Users which intend to contribute to Coq Platform should use `git clone --branch 2022.01.0 https://github.com/coq/platform.git`.
2424
Please note that the scripts are CR/LF sensitive, so if you use a Windows git client (not a Cygwin git) you should set `git config --global core.autocrlf false` - which is anyway a good idea.
2525
- Open a DOS command window, navigate to the download folder and execute `coq_platform_make_windows.bat`.
2626
- This will ask for the Cygwin installation path and setup a fresh Cygwin as build host (the created Coq is MinGW and runs without Cygwin).
@@ -31,25 +31,25 @@ This method is intended for experienced users, who may want to use opam to insta
3131
- Start a cygwin shell via `C:\<your_coq_platform_Cygwin_path>\Cygwin.bat`
3232
- Download, clone or pull the Coq Platform:
3333
- Download zip and expand:
34-
- `wget https://github.com/coq/platform/archive/refs/tags/2021.09.0.zip`
35-
- `unzip 2021.09.0.zip`
36-
- `cd platform-2021.09.0`
34+
- `wget https://github.com/coq/platform/archive/refs/tags/2022.01.0.zip`
35+
- `unzip 2022.01.0.zip`
36+
- `cd platform-2022.01.0`
3737
- Git clone:
38-
- `git clone --branch 2021.09.0 https://github.com/coq/platform.git`
38+
- `git clone --branch 2022.01.0 https://github.com/coq/platform.git`
3939
- `cd platform`
4040
- Git update (with existing git Coq Platform repo):
4141
- `cd platform`
42-
- `git fetch & git checkout 2021.09.0`
42+
- `git fetch & git checkout 2022.01.0`
4343
- Run the main Coq Platform installation script `coq_platform_make.sh`
4444
- The script will ask a few questions if no parameters are given and then run fully unattended.
4545
- The build time is between 1..5 hours, depending on CPU speed and RAM size.
4646
- In case the script aborts e.g. cause of internet issues, just rerun the batch file - it won't install Cygwin again (assuming you specify the same Cygwin destination folder).
4747
- The script has various options for configuring paths and proxies; see `example_coq_platform_make.bat` for an example command line.
4848
- The resulting Coq installation is opam based and best used from the Cygwin prompt (started via `C:\<your_coq_platform_Cygwin_path>\Cygwin.bat`)
49-
- The script creates a new opam switch named e.g. __coq-platform.2021.09.0~8.13 - the exact name depends on the Coq version and package pick you selected you selected.
49+
- The script creates a new opam switch named e.g. __coq-platform.2022.01.0~8.14~2022.01 - the exact name depends on the Coq version and package pick you selected you selected.
5050
This means the script does not touch your existing opam setup unless you already have a switch of this name.
5151
- Use the following commands at the Cygwin prompt to activate this switch after opening a new shell:
52-
- `opam switch __coq-platform.2021.09.0~8.13` (note: the switch name might vary if you choose a different version of Coq - please use `opam switch` to see a list of switch names)
52+
- `opam switch __coq-platform.2022.01.0~8.14~2022.01` (note: the switch name might vary if you choose a different version of Coq - please use `opam switch` to see a list of switch names)
5353
- `eval $(opam env)`
5454
- The second step can be automated by rerunning `opam init`
5555
- The main opam repositories for Coq and OCaml developments are already added to the created opam switch, so it should be easy to install additional Coq (or OCaml) packages.

doc/README_macOS.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ In case you want to use the fast path:
1212

1313
- Download the DMG package from https://github.com/coq/platform/releases (click on "Assets" at the end of a release section).
1414
- Open the downloaded DMG package with a double click.
15-
- Drag and drop the "Coq_Platform_2021.09.0.app" icon on the link to the "Applications" folder.
15+
- Drag and drop the "Coq_Platform_2022.01.0.app" icon on the link to the "Applications" folder.
1616
- CoqIDE appears under `/Applications` in Finder and in Launcher.
1717
- Beta releases of Coq Platform might contain unsigned packages, which macOS does not start by default. In case you get an error message
1818
stating "Coq_Platform.app cannot be opened because the developer cannot be verified" either download a release package, or alternatively
1919
right click the `Coq_Platform` app in `/Applications` in Finder and select `open`. You will see the same error message as before, but it will have an `Open` button now.
20-
- In case you want to use the installed `coqc` from the command line, please add the folder `/Applications/Coq_Platform_2021.09.0.app/Contents/Resources/bin` to your `PATH`.
20+
- In case you want to use the installed `coqc` from the command line, please add the folder `/Applications/Coq_Platform_2022.01.0.app/Contents/Resources/bin` to your `PATH`.
2121
- If you want to inspect the installed content, right click the `Coq_Platform` app in `/Applications` in Finder and select `Show Package Contents`.
2222

2323
A note to lecturers: it is easy to create a customized Windows installer from an opam switch - see [Customized Installers](#customized-installers)
@@ -33,15 +33,15 @@ This method is intended for experienced users, who may want to use opam to insta
3333
- If you have neither Homebrew nor MacPorts installed, read the section [Homebrew and MacPorts](#homebrew-and-macports) below.
3434
- If you have Homebrew installed, read the section [Homebrew issues and workarounds](#homebrew-issues-and-workarounds) below.
3535
- Get the Coq Platform scripts via either of these methods
36-
- Most users should download and extract `https://github.com/coq/platform/archive/refs/tags/2021.09.0.zip`.
37-
- Users which intend to contribute to Coq Platform should use `git clone --branch 2021.09.0 https://github.com/coq/platform.git`.
36+
- Most users should download and extract `https://github.com/coq/platform/archive/refs/tags/2022.01.0.zip`.
37+
- Users which intend to contribute to Coq Platform should use `git clone --branch 2022.01.0 https://github.com/coq/platform.git`.
3838
- Open a shell, navigate to the download folder and execute `coq_platform_make.sh`.
3939
- If you are using MacPorts, the system will ask once for sudo permissions to install prerequisites after installing OCaml (5..20 minutes after script start).
4040
- In case the script aborts e.g. cause of internet issues, just rerun the script.
41-
- The script creates a new opam switch named e.g. __coq-platform.2021.09.0~8.13 - the exact name depends on the Coq version and package pick you selected.
41+
- The script creates a new opam switch named e.g. __coq-platform.2022.01.0~8.14~2022.01 - the exact name depends on the Coq version and package pick you selected.
4242
This means the script does not touch your existing opam setup unless you already have a switch of this name.
4343
- Use the following commands to activate this switch after opening a new shell:
44-
- `opam switch __coq-platform.2021.09.0~8.13` (note: the switch name might vary if you choose a different version of Coq - please use `opam switch` to see a list of switch names)
44+
- `opam switch __coq-platform.2022.01.0~8.14~2022.01` (note: the switch name might vary if you choose a different version of Coq - please use `opam switch` to see a list of switch names)
4545
- `eval $(opam env)`
4646
- The second step can be automated by rerunning `opam init`
4747
- The main opam repositories for Coq and OCaml developments are already added to the created opam switch, so it should be easy to install additional Coq (or OCaml) packages.

0 commit comments

Comments
 (0)