diff --git a/README.md b/README.md index 3ad45fd..9f75b7b 100644 --- a/README.md +++ b/README.md @@ -195,8 +195,7 @@ The version of OCaml. Default: `"default"` (= Docker-Coq's default OCaml version for the given Coq version). -Among `"minimal"` (*deprecated, to be removed after 27 June 2022 AOE*), -`"default"`, `"4.02"`, `"4.05"`, `"4.07-flambda"`, `"4.08-flambda"`, `"4.09-flambda"`, `"4.10-flambda"`, `"4.11-flambda"`, `"4.12-flambda"`, `"4.13-flambda"`, `"4.14-flambda"`… +Among `"default"`, `"4.02"`, `"4.05"`, `"4.07-flambda"`, `"4.08-flambda"`, `"4.09-flambda"`, `"4.10-flambda"`, `"4.11-flambda"`, `"4.12-flambda"`, `"4.13-flambda"`, `"4.14-flambda"`… **Warning!** not all OCaml versions are available with all Coq versions. diff --git a/action.yml b/action.yml index 5952130..8d58d62 100644 --- a/action.yml +++ b/action.yml @@ -12,7 +12,7 @@ inputs: description: '"8.X", "latest", "dev", "8.X-native", "latest-native", or "dev-native"' default: 'latest' ocaml_version: - description: '"minimal" (deprecated), "default", "4.02", "4.05", or "4.XX-flambda", see https://github.com/coq-community/docker-coq/wiki#ocaml-versions-policy' + description: '"default", "4.02", "4.05", or "4.XX-flambda", see https://github.com/coq-community/docker-coq/wiki#ocaml-versions-policy' default: 'default' before_install: description: 'Customizable script run before "install".' diff --git a/entrypoint.sh b/entrypoint.sh index c45e5a4..0131668 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -56,7 +56,7 @@ usage() { Usage: INPUT_OPAM_FILE=file.opam \\ INPUT_COQ_VERSION=8.11 \\ - INPUT_OCAML_VERSION=minimal \\ + INPUT_OCAML_VERSION=default \\ INPUT_CUSTOM_SCRIPT='...' \\ INPUT_CUSTOM_IMAGE='' INPUT_EXPORT='' @@ -65,7 +65,7 @@ Usage: Options: INPUT_OPAM_FILE: the path of the .opam file (or a directory), relative to the repo root INPUT_COQ_VERSION: the version of Coq (without patch-level) -INPUT_OCAML_VERSION: the version of OCaml (minimal, 4.07-flambda, 4.09-flambda) +INPUT_OCAML_VERSION: the version of OCaml (default, 4.07-flambda, 4.09-flambda) INPUT_CUSTOM_SCRIPT: the main script run in the container INPUT_CUSTOM_IMAGE: the name of the Docker image to pull INPUT_EXPORT: the space-separated list of env variables to export @@ -139,34 +139,12 @@ EOF # HERE, "ocaml_version" is nonempty if [ "$INPUT_OCAML_VERSION" = 'minimal' ]; then - # TODO: uncomment this when the 'minimal' deprecation phase ends. - # echo "ERROR: ocaml_version: 'minimal' is not supported anymore." - # exit 1 - # TODO: remove the following when the 'minimal' deprecation phase ends. - # Rely on line 'echo "::add-matcher::$HOME/coq.json"' above. cat <