From 69d1f0fddc3961b0f834981ad342db29456aa2b4 Mon Sep 17 00:00:00 2001 From: Javier Chavarri Date: Tue, 24 Sep 2024 09:42:38 +0000 Subject: [PATCH 1/3] update to opam 2.3 --- .github/workflows/build-sample-project.yml | 5 +++-- Makefile | 2 +- opam-check-npm-deps.opam | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-sample-project.yml b/.github/workflows/build-sample-project.yml index fb4f272..8e469fe 100644 --- a/.github/workflows/build-sample-project.yml +++ b/.github/workflows/build-sample-project.yml @@ -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 }} @@ -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 diff --git a/Makefile b/Makefile index 13d8413..8643c38 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/opam-check-npm-deps.opam b/opam-check-npm-deps.opam index e57aa82..70cef1d 100644 --- a/opam-check-npm-deps.opam +++ b/opam-check-npm-deps.opam @@ -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"} @@ -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} [ From 55ec57a01abd6e134bc40945d83f870051094bf8 Mon Sep 17 00:00:00 2001 From: Javier Chavarri Date: Tue, 24 Sep 2024 10:16:43 +0000 Subject: [PATCH 2/3] more robust tests --- test/run.t | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/run.t b/test/run.t index 051fa3e..aa1a09f 100644 --- a/test/run.t +++ b/test/run.t @@ -29,7 +29,7 @@ When --dry-run is used, exit code is 0 > { > "license": "MIT", > "dependencies": { - > "react": "^18.2.0" + > "react": "18.2.0" > } > } > EOF @@ -137,8 +137,8 @@ Errors when version does not match > { > "license": "MIT", > "dependencies": { - > "react": "^18.2.0", - > "react-dom": "^18.2.0" + > "react": "18.2.0", + > "react-dom": "18.2.0" > } > } > EOF @@ -182,8 +182,8 @@ Supports package with more than one depext > { > "license": "MIT", > "dependencies": { - > "react": "^16.0.2", - > "react-dom": "^16.0.2" + > "react": "16.14.0", + > "react-dom": "16.14.0" > } > } > EOF @@ -225,8 +225,8 @@ Supports having more than one npm package in the syspkg list > { > "license": "MIT", > "dependencies": { - > "react": "^16.0.2", - > "react-dom": "^16.0.2" + > "react": "16.14.0", + > "react-dom": "16.14.0" > } > } > EOF @@ -268,7 +268,7 @@ Supports || filters in the npm-version string > { > "license": "MIT", > "dependencies": { - > "react": "^17.0.0" + > "react": "17.0.2" > } > } > EOF From 1810bc0112e71648f38766ad9bbced1a73355b40 Mon Sep 17 00:00:00 2001 From: Javier Chavarri Date: Tue, 24 Sep 2024 10:25:01 +0000 Subject: [PATCH 3/3] add changelog --- CHANGES.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 542ba21..d3fba6a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,7 @@ +## v3.0.0 (2024-09-24) + +- Support opam 2.3 + ## v2.0.0 (2023-09-24) - Support opam 2.2