Skip to content

Commit

Permalink
update to opam 2.3
Browse files Browse the repository at this point in the history
  • Loading branch information
jchavarri committed Sep 24, 2024
1 parent dffa1f2 commit 69d1f0f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/build-sample-project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- ubuntu-latest
# - windows-latest # for some reason windows build is not picking dune 3.5
ocaml-compiler:
- 5.1.x
- 5.2.x

fail-fast: false
runs-on: ${{ matrix.system }}
Expand All @@ -29,9 +29,10 @@ jobs:
node-version: current

- name: Use OCaml ${{ matrix.ocaml-compiler }}
uses: jchavarri/setup-ocaml@opam-v2
uses: ocaml/setup-ocaml@v3
with:
ocaml-compiler: ${{ matrix.ocaml-compiler }}
allow-prerelease-opam: true

- name: Install all deps
run: make install
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ help: ## Print this help message

.PHONY: create-switch
create-switch: ## Create opam switch
opam switch create . 5.1.0 -y --deps-only
opam switch create . 5.2.0 -y --deps-only

.PHONY: init
init: create-switch install ## Configure everything to develop this repository in local
Expand Down
4 changes: 2 additions & 2 deletions opam-check-npm-deps.opam
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ depends: [
"ocaml" {>= "4.14.0"}
"reason" {>= "3.8.1"}
"dune" {>= "3.8"}
"opam-client" {>= "2.2" & < "2.3"}
"opam-client" {>= "2.3" & < "2.4"}
"mccs" {>= "1.1+14"}
"angstrom" {>= "0.15.0"}
"fmt" {>= "0.9.0"}
Expand All @@ -25,7 +25,7 @@ depends: [
"ppx_sexp_conv"
"odoc" {with-doc}
]
available: opam-version >= "2.2" & opam-version < "2.3"
available: opam-version >= "2.3" & opam-version < "2.4"
build: [
["dune" "subst"] {dev}
[
Expand Down

0 comments on commit 69d1f0f

Please sign in to comment.