Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 0 additions & 41 deletions .github/workflows/oxcaml.yml

This file was deleted.

19 changes: 19 additions & 0 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -369,3 +369,22 @@ jobs:
restore-prefixes-first-match: nix-${{ runner.os }}-${{ github.job }}-
gc-max-store-size-linux: 5G
- run: nix develop .#microbench -c make dune build bench/micro

oxcaml-test:
name: OxCaml
needs: nix-build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- uses: nixbuild/nix-quick-install-action@v34
with:
nix_conf: ${{ env.EXTRA_NIX_CONFIG }}
- uses: nix-community/cache-nix-action@v6
with:
primary-key: |
nix-${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/*.nix', '**/flake.lock') }}
restore-prefixes-first-match: nix-${{ runner.os }}-${{ github.job }}-
gc-max-store-size-linux: 2G
- run: |
nix develop .#ox-minimal -c ocaml --version
nix develop .#ox-minimal -c make test-ox
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,9 @@ test-all: $(BIN)
test-all-sans-melange: $(BIN)
$(BIN) build @runtest @runtest-js @runtest-coq

test-ox: $(BIN)
$(BIN) runtest test/blackbox-tests/test-cases/oxcaml

.PHONY: check
check: $(BIN)
@$(BIN) build @check
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -383,10 +383,8 @@ A library can have more parameters than its dependencies:
> (library (name lib2) (parameters a b c) (libraries lib))
> EOF

$ ocamlc_where="$(ocamlc -where)"
$ export BUILD_PATH_PREFIX_MAP="/OCAMLC_WHERE=$ocamlc_where:$BUILD_PATH_PREFIX_MAP"
$ melc_compiler="$(which melc)" &> /dev/null
$ export BUILD_PATH_PREFIX_MAP="/MELC_COMPILER=$melc_compiler:$BUILD_PATH_PREFIX_MAP"
We expect to see the parameter flag in the merlin config:

$ dune build
$ dune ocaml dump-dot-merlin lib2 | grep 'parameter'
# FLG -parameter A -parameter B -parameter C
Expand Down
Loading