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
17 changes: 12 additions & 5 deletions .github/workflows/more-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ jobs:
- 5.4.x
- 5.3.x
- 5.2.x
- 4.14.x
exclude:
# We exclude the combination already tested in the 'ci' workflow.
- os: ubuntu-latest
Expand All @@ -54,15 +55,21 @@ jobs:
# janestreet-bleeding: https://github.com/janestreet/opam-repository.git
# janestreet-bleeding-external: https://github.com/janestreet/opam-repository.git#external-packages

# Setting `(implicit_transitive_deps VALUE)` conditionally based on the compiler version.
- name: Edit dune-project
run: opam exec -- ocaml .github/workflows/edit_dune_project_dot_ml "${{ matrix.ocaml-compiler }}"
- name: Environment setup
run: |
if [ "${{ matrix.ocaml-compiler }}" = "4.14.x" ]; then
echo "PACKAGES=fpath-sexp0" >> "$GITHUB_ENV"
echo "OPAM_PACKAGES=./fpath-sexp0.opam" >> "$GITHUB_ENV"
else
echo "PACKAGES=fpath-sexp0,fpath-base,fpath-base-tests" >> "$GITHUB_ENV"
echo "OPAM_PACKAGES=./fpath-sexp0.opam ./fpath-base.opam ./fpath-base-tests.opam" >> "$GITHUB_ENV"
fi

# We build and run tests for a subset of packages. More tests are run in
# the development workflow and as part of the main CI job. These are the
# tests that are checked for every combination of os and ocaml-compiler.
- name: Install dependencies
run: opam install ./fpath-sexp0.opam ./fpath-base.opam ./fpath-base-tests.opam --deps-only --with-test
run: opam install ${{ env.OPAM_PACKAGES }} --deps-only --with-test

- name: Build & Run tests
run: opam exec -- dune build @all @runtest -p fpath-sexp0,fpath-base,fpath-base-tests
run: opam exec -- dune build @all @runtest --only-packages=${{ env.PACKAGES }}
12 changes: 12 additions & 0 deletions dune-workspace
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
(lang dune 3.20)

(lock_dir
(repositories overlay upstream alpha mbarbin))

(repository
(name mbarbin)
(url "git+https://github.com/mbarbin/opam-repository.git"))

(repository
(name alpha)
(url "git+https://github.com/kit-ty-kate/opam-alpha-repository.git"))
13 changes: 13 additions & 0 deletions dune-workspace-4.14
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
(lang dune 3.20)

(pkg enabled)

(lock_dir
(repositories overlay upstream mbarbin)
(constraints
(ocaml
(= 4.14.2))))

(repository
(name mbarbin)
(url "git+https://github.com/mbarbin/opam-repository.git"))
13 changes: 13 additions & 0 deletions dune-workspace-5.2
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
(lang dune 3.20)

(pkg enabled)

(lock_dir
(repositories overlay upstream mbarbin)
(constraints
(ocaml
(= 5.2.1))))

(repository
(name mbarbin)
(url "git+https://github.com/mbarbin/opam-repository.git"))
13 changes: 13 additions & 0 deletions dune-workspace-5.3
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
(lang dune 3.20)

(pkg enabled)

(lock_dir
(repositories overlay upstream mbarbin)
(constraints
(ocaml
(= 5.3.0))))

(repository
(name mbarbin)
(url "git+https://github.com/mbarbin/opam-repository.git"))
17 changes: 17 additions & 0 deletions dune-workspace-5.4
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
(lang dune 3.20)

(pkg enabled)

(lock_dir
(repositories overlay upstream alpha mbarbin)
(constraints
(ocaml
(= 5.4.0))))

(repository
(name mbarbin)
(url "git+https://github.com/mbarbin/opam-repository.git"))

(repository
(name alpha)
(url "git+https://github.com/kit-ty-kate/opam-alpha-repository.git"))