Skip to content

Commit 92791fc

Browse files
authored
Misc: switch to opam 2.2 (#1616)
1 parent 1229490 commit 92791fc

File tree

4 files changed

+10
-26
lines changed

4 files changed

+10
-26
lines changed

.github/workflows/build.yml

+7-22
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
skip-test: false
5959
skip-doc: true
6060
- os: windows-latest
61-
ocaml-compiler: ocaml.5.2.0,ocaml-option-mingw
61+
ocaml-compiler: "5.2"
6262
skip-effects: false
6363
skip-test: false
6464
skip-doc: true
@@ -82,27 +82,12 @@ jobs:
8282
node-version: lts/*
8383

8484
- name: Set-up OCaml ${{ matrix.ocaml-compiler }}
85-
if: runner.os == 'Windows'
86-
uses: ocaml/setup-ocaml@v2
87-
with:
88-
ocaml-compiler: ${{ matrix.ocaml-compiler }}
89-
opam-repositories: |
90-
dra27: https://github.com/dra27/opam-repository.git#windows-5.0
91-
default: https://github.com/ocaml-opam/opam-repository-mingw.git#sunset
92-
opam: https://github.com/ocaml/opam-repository.git
93-
dune-cache: true
94-
opam-depext: ${{ !matrix.skip-test }}
95-
opam-depext-flags: --with-test
96-
97-
- name: Set-up OCaml ${{ matrix.ocaml-compiler }}
98-
if: runner.os != 'Windows'
99-
uses: ocaml/setup-ocaml@v2
85+
uses: ocaml/setup-ocaml@v3.0.0-beta
10086
with:
10187
ocaml-compiler: ${{ matrix.ocaml-compiler }}
10288
allow-prerelease-opam: true
10389
dune-cache: true
104-
opam-depext: ${{ !matrix.skip-test }}
105-
opam-depext-flags: --with-test
90+
opam-pin: false
10691

10792
- run: opam install . --best-effort
10893
if: ${{ matrix.skip-test }}
@@ -144,13 +129,13 @@ jobs:
144129
uses: actions/checkout@v4
145130

146131
- name: Set-up OCaml
147-
uses: ocaml/setup-ocaml@v2
132+
uses: ocaml/setup-ocaml@v3.0.0-beta
148133
with:
149134
ocaml-compiler: "5.2"
150135
allow-prerelease-opam: true
151136
dune-cache: true
152137

153-
- uses: ocaml/setup-ocaml/lint-opam@v2
138+
- uses: ocaml/setup-ocaml/lint-opam@v3.0.0-beta
154139
continue-on-error: true
155140

156141
lint-fmt:
@@ -160,10 +145,10 @@ jobs:
160145
uses: actions/checkout@v4
161146

162147
- name: Set-up OCaml
163-
uses: ocaml/setup-ocaml@v2
148+
uses: ocaml/setup-ocaml@v3.0.0-beta
164149
with:
165150
ocaml-compiler: "5.2"
166151
allow-prerelease-opam: true
167152
dune-cache: true
168153

169-
- uses: ocaml/setup-ocaml/lint-fmt@v2
154+
- uses: ocaml/setup-ocaml/lint-fmt@v3.0.0-beta

.gitmodules

-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +0,0 @@
1-
[submodule "compiler/tests-js-parser/test262"]
2-
path = compiler/tests-js-parser/test262
3-
url = https://github.com/tc39/test262.git

compiler/tests-js-parser/dune

+3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
(action
1111
(run ./run.exe pass)))
1212

13+
;; git submodule add test262 https://github.com/tc39/test262.git
14+
;; git checkout 6cbb6da9473c56d95358d8e679c5a6d2b4574efb
15+
1316
(rule
1417
(alias runtest-parser)
1518
(deps

compiler/tests-js-parser/test262

-1
This file was deleted.

0 commit comments

Comments
 (0)