Skip to content

Commit

Permalink
Misc: switch to opam 2.2 (#1616)
Browse files Browse the repository at this point in the history
  • Loading branch information
hhugo authored Jun 24, 2024
1 parent 1229490 commit 92791fc
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 26 deletions.
29 changes: 7 additions & 22 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
skip-test: false
skip-doc: true
- os: windows-latest
ocaml-compiler: ocaml.5.2.0,ocaml-option-mingw
ocaml-compiler: "5.2"
skip-effects: false
skip-test: false
skip-doc: true
Expand All @@ -82,27 +82,12 @@ jobs:
node-version: lts/*

- name: Set-up OCaml ${{ matrix.ocaml-compiler }}
if: runner.os == 'Windows'
uses: ocaml/setup-ocaml@v2
with:
ocaml-compiler: ${{ matrix.ocaml-compiler }}
opam-repositories: |
dra27: https://github.com/dra27/opam-repository.git#windows-5.0
default: https://github.com/ocaml-opam/opam-repository-mingw.git#sunset
opam: https://github.com/ocaml/opam-repository.git
dune-cache: true
opam-depext: ${{ !matrix.skip-test }}
opam-depext-flags: --with-test

- name: Set-up OCaml ${{ matrix.ocaml-compiler }}
if: runner.os != 'Windows'
uses: ocaml/setup-ocaml@v2
uses: ocaml/[email protected]
with:
ocaml-compiler: ${{ matrix.ocaml-compiler }}
allow-prerelease-opam: true
dune-cache: true
opam-depext: ${{ !matrix.skip-test }}
opam-depext-flags: --with-test
opam-pin: false

- run: opam install . --best-effort
if: ${{ matrix.skip-test }}
Expand Down Expand Up @@ -144,13 +129,13 @@ jobs:
uses: actions/checkout@v4

- name: Set-up OCaml
uses: ocaml/setup-ocaml@v2
uses: ocaml/setup-ocaml@v3.0.0-beta
with:
ocaml-compiler: "5.2"
allow-prerelease-opam: true
dune-cache: true

- uses: ocaml/setup-ocaml/lint-opam@v2
- uses: ocaml/setup-ocaml/lint-opam@v3.0.0-beta
continue-on-error: true

lint-fmt:
Expand All @@ -160,10 +145,10 @@ jobs:
uses: actions/checkout@v4

- name: Set-up OCaml
uses: ocaml/setup-ocaml@v2
uses: ocaml/setup-ocaml@v3.0.0-beta
with:
ocaml-compiler: "5.2"
allow-prerelease-opam: true
dune-cache: true

- uses: ocaml/setup-ocaml/lint-fmt@v2
- uses: ocaml/setup-ocaml/lint-fmt@v3.0.0-beta
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
[submodule "compiler/tests-js-parser/test262"]
path = compiler/tests-js-parser/test262
url = https://github.com/tc39/test262.git
3 changes: 3 additions & 0 deletions compiler/tests-js-parser/dune
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
(action
(run ./run.exe pass)))

;; git submodule add test262 https://github.com/tc39/test262.git
;; git checkout 6cbb6da9473c56d95358d8e679c5a6d2b4574efb

(rule
(alias runtest-parser)
(deps
Expand Down
1 change: 0 additions & 1 deletion compiler/tests-js-parser/test262
Submodule test262 deleted from 6cbb6d

0 comments on commit 92791fc

Please sign in to comment.