Skip to content

Commit de30345

Browse files
committed
chore(oxcaml): CI with opam instead of nix
Signed-off-by: Arthur Wendling <[email protected]>
1 parent c7c1170 commit de30345

File tree

2 files changed

+39
-19
lines changed

2 files changed

+39
-19
lines changed

.github/workflows/oxcaml.yml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: OxCaml (experimental)
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
workflow_dispatch:
8+
pull_request:
9+
10+
permissions:
11+
contents: read
12+
13+
jobs:
14+
oxcaml:
15+
name: Building Dune with OxCaml
16+
runs-on: ubuntu-latest
17+
steps:
18+
- uses: actions/checkout@v5
19+
20+
- name: Install OCaml
21+
uses: ocaml/setup-ocaml@v3
22+
with:
23+
ocaml-compiler: ocaml-variants.5.2.0+ox
24+
opam-repositories: |
25+
oxcaml: "git+https://github.com/oxcaml/opam-repository.git"
26+
default: "git+https://github.com/ocaml/opam-repository.git"
27+
opam-pin: false
28+
29+
- name: Pin deps
30+
run: opam pin add -n . --with-version=3.20.2+ox
31+
32+
- name: Install deps
33+
run: opam install csexp pp re spawn uutf ./dune.opam
34+
35+
- name: Build dune
36+
run: opam exec -- make bootstrap
37+
38+
- name: Run OxCaml tests
39+
run: opam exec -- ./dune.exe test ./test/blackbox-tests/test-cases/oxcaml

.github/workflows/workflow.yml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -370,25 +370,6 @@ jobs:
370370
gc-max-store-size-linux: 5G
371371
- run: nix develop .#microbench -c make dune build bench/micro
372372

373-
oxcaml-test:
374-
name: OxCaml
375-
needs: nix-build
376-
runs-on: ubuntu-latest
377-
steps:
378-
- uses: actions/checkout@v5
379-
- uses: nixbuild/nix-quick-install-action@v34
380-
with:
381-
nix_conf: ${{ env.EXTRA_NIX_CONFIG }}
382-
- uses: nix-community/cache-nix-action@v6
383-
with:
384-
primary-key: |
385-
nix-${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/*.nix', '**/flake.lock') }}
386-
restore-prefixes-first-match: nix-${{ runner.os }}-${{ github.job }}-
387-
gc-max-store-size-linux: 2G
388-
- run: |
389-
nix develop .#ox-minimal -c ocaml --version
390-
nix develop .#ox-minimal -c make test-ox
391-
392373
utop-dev-tool-test:
393374
name: Test that the utop dev tool can be built and run
394375
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)