Skip to content

Commit a1a71c2

Browse files
committed
OxCaml: setup CI
1 parent c1ae613 commit a1a71c2

File tree

5 files changed

+499
-3
lines changed

5 files changed

+499
-3
lines changed

.github/workflows/js_of_ocaml.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,13 @@ jobs:
9696
skip-effects: true
9797
skip-test: true
9898
skip-doc: true
99+
- os: ubuntu-latest
100+
os-name: Ubuntu
101+
ocaml-name: "OxCaml"
102+
ocaml-compiler: "ocaml-variants.5.2.0+ox"
103+
skip-effects: false
104+
skip-test: false
105+
skip-doc: true
99106

100107
runs-on: ${{ matrix.os }}
101108

@@ -140,6 +147,16 @@ jobs:
140147
uses: ocaml/setup-ocaml@v3
141148
with:
142149
ocaml-compiler: ${{ matrix.ocaml-compiler }}
150+
if: matrix.ocaml-compiler != 'ocaml-variants.5.2.0+ox'
151+
152+
- name: Set-up OxCaml ${{ matrix.ocaml-compiler }}
153+
uses: ocaml/setup-ocaml@v3
154+
with:
155+
ocaml-compiler: ${{ matrix.ocaml-compiler }}
156+
opam-repositories: |
157+
default: https://github.com/ocaml/opam-repository.git
158+
ox: https://github.com/oxcaml/opam-repository.git
159+
if: matrix.ocaml-compiler == 'ocaml-variants.5.2.0+ox'
143160

144161
# Work-around a race between reinstalling mingw-w64-shims
145162
# (because of conf-pkg-config optional dep) and installing other
@@ -163,6 +180,9 @@ jobs:
163180
# Install the test dependencies
164181
if: ${{ !matrix.skip-test }}
165182

183+
- name: Pin js_of_ocaml
184+
run: opam pin . -n --with-version 6.0.1+ox
185+
166186
- run: opam install .
167187
# Install the packages (without running the tests)
168188
if: ${{ !matrix.skip-test }}

.github/workflows/wasm_of_ocaml.yml

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,12 @@ jobs:
5858
separate_compilation: false
5959
jane_street_tests: true
6060
all_jane_street_tests: false
61+
- os: ubuntu-latest
62+
os-name: Ubuntu
63+
ocaml-compiler: "ocaml-variants.5.2.0+ox"
64+
separate_compilation: true
65+
jane_street_tests: true
66+
all_jane_street_tests: true
6167

6268
runs-on: ${{ matrix.os }}
6369

@@ -82,13 +88,20 @@ jobs:
8288
path: wasm_of_ocaml
8389

8490
- name: Checkout Jane Street opam repository
85-
if: matrix.jane_street_tests
91+
if: matrix.jane_street_tests && matrix.ocaml-compiler != 'ocaml-variants.5.2.0+ox'
8692
uses: actions/checkout@v5
8793
with:
8894
repository: janestreet/opam-repository
8995
ref: 2819773f29b6f6c14b918eae3cb40c8ff6b22d0e
9096
path: janestreet/opam-repository
9197

98+
- name: Checkout OxCaml opam repository
99+
if: matrix.jane_street_tests && matrix.ocaml-compiler == 'ocaml-variants.5.2.0+ox'
100+
uses: actions/checkout@v5
101+
with:
102+
repository: oxcaml/opam-repository
103+
path: janestreet/opam-repository
104+
92105
- name: Set-up Node.js
93106
uses: actions/setup-node@v5
94107
with:
@@ -98,6 +111,16 @@ jobs:
98111
uses: ocaml/setup-ocaml@v3
99112
with:
100113
ocaml-compiler: ${{ matrix.ocaml-compiler }}
114+
if: matrix.ocaml-compiler != 'ocaml-variants.5.2.0+ox'
115+
116+
- name: Set-up OxCaml ${{ matrix.ocaml-compiler }}
117+
uses: ocaml/setup-ocaml@v3
118+
with:
119+
ocaml-compiler: ${{ matrix.ocaml-compiler }}
120+
opam-repositories: |
121+
default: https://github.com/ocaml/opam-repository.git
122+
ox: https://github.com/oxcaml/opam-repository.git
123+
if: matrix.ocaml-compiler == 'ocaml-variants.5.2.0+ox'
101124

102125
- name: Set-up Binaryen
103126
uses: Aandreba/setup-binaryen@v1.0.0
@@ -116,14 +139,17 @@ jobs:
116139

117140
- name: Pin wasm_of_ocaml
118141
working-directory: ./wasm_of_ocaml
119-
run: opam pin . -n --with-version dev
142+
run: opam pin . -n --with-version 6.0.1+ox
143+
144+
- name: Pin ppxlib
145+
run: opam pin add ppxlib -n 0.35.0
146+
if: matrix.ocaml-compiler != 'ocaml-variants.5.2.0+ox'
120147

121148
- name: Checkout Jane Street packages
122149
if: matrix.jane_street_tests
123150
run: |
124151
opam repo add js janestreet/opam-repository
125152
opam install opam-format
126-
opam pin add ppxlib -n 0.35.0
127153
opam exec -- dune exec --root wasm_of_ocaml tools/ci_setup.exe
128154
129155
- name: Pin Jane Street packages
File renamed without changes.

0 commit comments

Comments
 (0)