Skip to content

Commit 34643da

Browse files
authored
chore(oxcaml): nix based oxcaml ci (#12632)
Signed-off-by: Ali Caglayan <[email protected]>
1 parent 7e3fba3 commit 34643da

File tree

4 files changed

+24
-45
lines changed

4 files changed

+24
-45
lines changed

.github/workflows/oxcaml.yml

Lines changed: 0 additions & 41 deletions
This file was deleted.

.github/workflows/workflow.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,3 +369,22 @@ jobs:
369369
restore-prefixes-first-match: nix-${{ runner.os }}-${{ github.job }}-
370370
gc-max-store-size-linux: 5G
371371
- run: nix develop .#microbench -c make dune build bench/micro
372+
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

Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,9 @@ test-all: $(BIN)
112112
test-all-sans-melange: $(BIN)
113113
$(BIN) build @runtest @runtest-js @runtest-coq
114114

115+
test-ox: $(BIN)
116+
$(BIN) runtest test/blackbox-tests/test-cases/oxcaml
117+
115118
.PHONY: check
116119
check: $(BIN)
117120
@$(BIN) build @check

test/blackbox-tests/test-cases/oxcaml/library-field-parameters.t

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -383,10 +383,8 @@ A library can have more parameters than its dependencies:
383383
> (library (name lib2) (parameters a b c) (libraries lib))
384384
> EOF
385385

386-
$ ocamlc_where="$(ocamlc -where)"
387-
$ export BUILD_PATH_PREFIX_MAP="/OCAMLC_WHERE=$ocamlc_where:$BUILD_PATH_PREFIX_MAP"
388-
$ melc_compiler="$(which melc)" &> /dev/null
389-
$ export BUILD_PATH_PREFIX_MAP="/MELC_COMPILER=$melc_compiler:$BUILD_PATH_PREFIX_MAP"
386+
We expect to see the parameter flag in the merlin config:
387+
390388
$ dune build
391389
$ dune ocaml dump-dot-merlin lib2 | grep 'parameter'
392390
# FLG -parameter A -parameter B -parameter C

0 commit comments

Comments
 (0)