Skip to content

Commit

Permalink
Add macOS runner, disable musl64 for now
Browse files Browse the repository at this point in the history
  • Loading branch information
anmonteiro committed May 26, 2021
1 parent ae7de2e commit 9828c6b
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 8 deletions.
28 changes: 23 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,39 @@ on:
branches:
- master
jobs:
tests:
runs-on: ubuntu-latest
macOS:
runs-on: macos-latest
strategy:
fail-fast: false
matrix:
ocamlVersion: [4_08, 4_10, 4_11, 4_12]
# Tests only on 2 latest versions as macOS runners are more expensive
ocamlVersion: [4_11, 4_12]
steps:
- uses: actions/checkout@v2
with:
submodules: 'recursive'
- uses: cachix/install-nix-action@v12
with:
skip_adding_nixpkgs_channel: true
- uses: cachix/cachix-action@v8
with:
name: anmonteiro
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
- name: "Run nix-build"
run: nix-build ./nix/ci/test.nix -A native --argstr ocamlVersion ${{ matrix.ocamlVersion }}

linux:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
ocamlVersion: [4_08, 4_10, 4_11, 4_12]
steps:
- uses: actions/checkout@v2
with:
submodules: 'recursive'
- uses: cachix/install-nix-action@v13
- uses: cachix/cachix-action@v10
with:
name: anmonteiro
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
- name: "Run nix-build"
run: nix-build ./nix/ci/test.nix -A native -A musl64 --argstr ocamlVersion ${{ matrix.ocamlVersion }}
1 change: 0 additions & 1 deletion nix/ci/test.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ let
buildInputs = (lib.attrValues piafDrvs) ++ (with ocamlPackages; [ ocaml dune findlib pkgs.ocamlformat ]);
doCheck = true;
checkPhase = ''
echo OI
# Check code is formatted with OCamlformat
dune build @fmt
'';
Expand Down
2 changes: 1 addition & 1 deletion nix/sources.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
let
overlays =
builtins.fetchTarball
https://github.com/anmonteiro/nix-overlays/archive/68b87e980.tar.gz;
https://github.com/anmonteiro/nix-overlays/archive/58960d0.tar.gz;

in
import "${overlays}/sources.nix" {
Expand Down
2 changes: 1 addition & 1 deletion vendor/ocaml-h2

0 comments on commit 9828c6b

Please # to comment.