Skip to content

Commit

Permalink
Merge pull request #12 from ahrefs/opam-2-3
Browse files Browse the repository at this point in the history
update to opam 2.3
  • Loading branch information
jchavarri authored Sep 24, 2024
2 parents dffa1f2 + 1810bc0 commit 107bcd4
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 13 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
4 changes: 4 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## v3.0.0 (2024-09-24)

- Support opam 2.3

## v2.0.0 (2023-09-24)

- Support opam 2.2
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
16 changes: 8 additions & 8 deletions test/run.t
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -268,7 +268,7 @@ Supports || filters in the npm-version string
> {
> "license": "MIT",
> "dependencies": {
> "react": "^17.0.0"
> "react": "17.0.2"
> }
> }
> EOF
Expand Down

0 comments on commit 107bcd4

Please sign in to comment.