Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch minimum OCaml version to 4.08 #4775

Merged
merged 2 commits into from
Aug 6, 2021
Merged

Switch minimum OCaml version to 4.08 #4775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
220449e
Update minimum OCaml versions for 2.2.0
dra27 Jul 22, 2021
ec39ef1
Stop disabling warning 67 in configure
dra27 Jul 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions .github/scripts/legacy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/bin/bash -xue

. .github/scripts/preamble.sh

export OPAMYES=1
export OCAMLRUNPARAM=b

opam init default git+$OPAM_REPO#$OPAM_REPO_SHA
eval $(opam env)
OPAMCLI=2.0 opam reinstall ocaml-system --unlock-base
opam upgrade
for package in core format installer ; do
opam pin add -yn opam-$package .
done
opam install opam-core opam-format opam-installer --deps-only
dune build --profile=dev --only-packages opam-core,opam-format,opam-installer @install
41 changes: 37 additions & 4 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,14 +108,14 @@ jobs:
strategy:
matrix:
os: [ ubuntu-latest ]
ocamlv: [ 4.03.0, 4.04.2, 4.05.0, 4.06.1, 4.07.1, 4.08.1, 4.09.1, 4.10.2, 4.11.2, 4.12.0 ]
ocamlv: [ 4.08.1, 4.09.1, 4.10.2, 4.11.2, 4.12.0 ]
include:
- os: macos-latest
ocamlv: 4.12.0
# Intentionnaly fail fast, no need to run all build if there is a
# Intentionally fail fast, no need to run all build if there is a
# problem in a given version; usually it is functions not defined in lower
# versions of caml
# fail-fast: false
# versions of OCaml
fail-fast: true
steps:
- name: install deps
if: ${{ matrix.os == 'ubuntu-latest' }}
Expand All @@ -137,6 +137,39 @@ jobs:
OCAML_VERSION: ${{ matrix.ocamlv }}
run: bash -exu .github/scripts/main.sh

####
# Legacy
####
legacy:
runs-on: ubuntu-latest
strategy:
matrix:
os: [ Linux ]
ocamlv: [ 4.03.0, 4.04.2, 4.05.0, 4.06.1, 4.07.1 ]
# Intentionally fail fast, no need to run all build if there is a
# problem in a given version; usually it is functions not defined in lower
# versions of OCaml
fail-fast: true
steps:
- name: install deps
run: sudo apt install opam
- uses: actions/checkout@v2
- name: ocaml ${{ matrix.ocamlv }} cache
id: ocaml-cache
uses: actions/cache@v2
with:
path: ${{ env.GH_OCAML_CACHE }}
key: ${{ runner.os }}-ocaml-${{ matrix.ocamlv }}-${{ hashFiles ('.github/scripts/ocaml-cache.sh', '.github/scripts/preamble.sh') }}
- name: Building ocaml ${{ matrix.ocamlv }} cache
if: steps.ocaml-cache.outputs.cache-hit != 'true'
env:
OCAML_VERSION: ${{ matrix.ocamlv }}
run: bash -exu .github/scripts/ocaml-cache.sh ocaml
- name: Build
env:
OCAML_VERSION: ${{ matrix.ocamlv }}
run: bash -exu .github/scripts/legacy.sh

####
# Opam tests
####
Expand Down
15 changes: 2 additions & 13 deletions configure
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 2 additions & 9 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ AS_IF([ test -x bootstrap/ocaml/bin/ocamlc -o -x bootstrap/ocaml/bin/ocamlopt ],
export PATH="$PATH_PREPEND$PATH"
])

# XXX This isn't strictly correct for Windows
MIN_OCAML_VERSION=4.03.0
MIN_OCAML_VERSION=4.08.0

AC_PROG_OCAML
if test "x$OCAMLC" = "xno"; then
Expand Down Expand Up @@ -86,10 +85,7 @@ AC_SUBST(LIB_PREFIX,$LIB_PREFIX)
AC_SUBST(CPATH,$CPATH)
AC_SUBST(LIBRARY_PATH,$LIBRARY_PATH)

# Check that OCaml version is greater or equal to 4.03.0
# Native Windows builds require at least 4.06.0 for the Unicode runtime.
AS_IF([test "x${enable_version_check}" != "xno"], [
AS_IF([ test ${WIN32} -eq 1 ],[MIN_OCAML_VERSION=4.06.0])
AX_COMPARE_VERSION(
[$OCAMLVERSION], [lt], [$MIN_OCAML_VERSION],
AC_MSG_ERROR([Your version of OCaml ($OCAMLVERSION) is not supported]))
Expand Down Expand Up @@ -168,11 +164,8 @@ AS_IF([test "x${with_libacl}" = "xyes"],[
])
])

CONF_OCAMLFLAGS="-w -67"
CONF_OCAMLFLAGS=''

AS_IF([test "x${CI}" != "x"], [
CONF_OCAMLFLAGS="${CONF_OCAMLFLAGS} -w -67"
],[])
AS_IF([test "x${CI}" != "x" -o "x${enable_developer_mode}" = "xyes"],[
AS_IF([test "x${CCOMP_TYPE}" = "xmsvc"],[
CONF_CFLAGS="\"/WX\""
Expand Down
3 changes: 2 additions & 1 deletion master_changes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,14 @@ users)
*

## VCS
*
* Use 4.08's unnamed functor arguments to silence warning 67 [#4775 @dra27]

## Build
* Bump src_exts and fix build compat with Dune 2.9.0 [#4752 @dra27]
* Upgrade to dose3 >= 6.1 and vendor dose3 7.0.0 [#4760 @kit-ty-kate]
* Change minimum required OCaml to 4.03.0 [#4770 @dra27]
* Change minimum required Dune to 2.0 [#4770 @dra27]
* Change minimum required OCaml to 4.08.0 for everything except opam-core, opam-format and opam-installer [#4775 @dra27]

## Infrastructure
*
Expand Down
2 changes: 1 addition & 1 deletion opam-client.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ build: [
["dune" "build" "-p" name "-j" jobs]
]
depends: [
"ocaml" {>= "4.03.0"}
"ocaml" {>= "4.08.0"}
"opam-state" {= version}
"opam-solver" {= version}
"base64" {>= "3.1.0"}
Expand Down
2 changes: 1 addition & 1 deletion opam-core.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ build: [
["dune" "build" "-p" name "-j" jobs]
]
depends: [
"ocaml" {>= "4.03.0"}
"ocaml" {(>= "4.03.0" & os != "win32") | >= "4.06.0"}
"base-unix"
"base-bigarray"
"ocamlgraph"
Expand Down
2 changes: 1 addition & 1 deletion opam-devel.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ build: [
[make "%{name}%.install"]
]
depends: [
"ocaml" {>= "4.03.0"}
"ocaml" {>= "4.08.0"}
"opam-client" {= version}
"cmdliner" {>= "0.9.8"}
"dune" {>= "2.0.0"}
Expand Down
2 changes: 1 addition & 1 deletion opam-format.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ build: [
["dune" "build" "-p" name "-j" jobs]
]
depends: [
"ocaml" {>= "4.03.0"}
"ocaml" {(>= "4.03.0" & os != "win32") | >= "4.06.0"}
"opam-core" {= version}
"opam-file-format" {>= "2.1.3"}
"re" {>= "1.9.0"}
Expand Down
2 changes: 1 addition & 1 deletion opam-installer.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ build: [
["dune" "build" "-p" name "-j" jobs]
]
depends: [
"ocaml" {>= "4.03.0"}
"ocaml" {(>= "4.03.0" & os != "win32") | >= "4.06.0"}
"opam-format" {= version}
"cmdliner" {>= "0.9.8"}
"dune" {>= "2.0.0"}
Expand Down
2 changes: 1 addition & 1 deletion opam-repository.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ build: [
["dune" "build" "-p" name "-j" jobs]
]
depends: [
"ocaml" {>= "4.03.0"}
"ocaml" {>= "4.08.0"}
"opam-format" {= version}
"dune" {>= "2.0.0"}
]
2 changes: 1 addition & 1 deletion opam-solver.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ build: [
["dune" "build" "-p" name "-j" jobs]
]
depends: [
"ocaml" {>= "4.03.0"}
"ocaml" {>= "4.08.0"}
"opam-format" {= version}
"mccs" {>= "1.1+9"}
"dose3" {>= "6.1"}
Expand Down
2 changes: 1 addition & 1 deletion opam-state.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ build: [
["dune" "build" "-p" name "-j" jobs]
]
depends: [
"ocaml" {>= "4.03.0"}
"ocaml" {>= "4.08.0"}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is to be noted that notable plugins, such as dune-release and opam-publish, use opam-state.

Not a blocker ofc but it's probably good to ping the devs. cc @NathanReb

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed - I'd checked those through before proposing it. opam-publish is already pulled towards 4.08+ by depending on cohttp via ocaml-github and dune-release was already 4.06+ (and I think @emillon agreed it would shift on @NathanReb's behalf!)

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I confirm there's no problem on my side for bumping minimum requirements on OCaml, to the contrary I'm rather glad about it!

"opam-repository" {= version}
"re" {>= "1.9.0"}
"dune" {>= "2.0.0"}
Expand Down
12 changes: 6 additions & 6 deletions src/client/opamCLIVersion.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ let of_json = function
| `String x -> of_string_opt x
| _ -> None

let ( >= ) = OpamCompat.Stdlib.( >= )
let ( < ) = OpamCompat.Stdlib.( < )
let compare = OpamCompat.Stdlib.compare
let ( >= ) = Stdlib.( >= )
let ( < ) = Stdlib.( < )
let compare = Stdlib.compare

let previous cli =
let f previous version =
Expand All @@ -64,9 +64,9 @@ module Sourced = struct
end

module Op = struct
let ( @>= ) (c,_) = OpamCompat.Stdlib.( >= ) c
let ( @< ) (c,_) = OpamCompat.Stdlib.( < ) c
let ( @= ) (c,_) = OpamCompat.Stdlib.( = ) c
let ( @>= ) (c,_) = Stdlib.( >= ) c
let ( @< ) (c,_) = Stdlib.( < ) c
let ( @= ) (c,_) = Stdlib.( = ) c
end

module O = struct
Expand Down
2 changes: 1 addition & 1 deletion src/repository/opamVCS.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,4 @@ module type VCS = sig
end

(** Create a backend from a [VCS] implementation. *)
module Make(VCS : VCS) : OpamRepositoryBackend.S
module Make(_ : VCS) : OpamRepositoryBackend.S