From 30f74fdbad6dfab9caa25dada435db3c85f0f318 Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Sat, 2 Nov 2024 19:27:15 -0700 Subject: [PATCH 1/2] nix workflow: trim macOS runs --- .github/workflows/nix-build.yml | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/nix-build.yml b/.github/workflows/nix-build.yml index d7b2825a4..0e465a0b2 100644 --- a/.github/workflows/nix-build.yml +++ b/.github/workflows/nix-build.yml @@ -36,19 +36,16 @@ jobs: run: nix-build ./nix/ci.nix --argstr ocamlVersion ${{ matrix.ocaml-version }} macos-tests: - name: Build and test (${{ matrix.os }}) (${{ matrix.ocaml-version }}) + name: Build and test (${{ matrix.setup.os }}) (${{ matrix.setup.ocaml-version }}) strategy: matrix: - os: - - macos-13 - - macos-14 - ocaml-version: - - 4_14 - - 5_0 - - 5_2 - - runs-on: ${{ matrix.os }} + setup: + - {ocaml-version: '5_2', os: macos-13} + - {ocaml-version: '4_14', os: macos-14} + - {ocaml-version: '5_0', os: macos-14} + - {ocaml-version: '5_2', os: macos-14} + runs-on: ${{ matrix.setup.os }} steps: - uses: actions/checkout@v4 with: @@ -59,5 +56,5 @@ jobs: extra-substituters = https://anmonteiro.nix-cache.workers.dev extra-trusted-public-keys = ocaml.nix-cache.com-1:/xI2h2+56rwFfKyyFVbkJSeGqSIYMC/Je+7XXqGKDIY= - name: "Run nix-build" - run: nix-build ./nix/ci.nix --argstr ocamlVersion ${{ matrix.ocaml-version }} + run: nix-build ./nix/ci.nix --argstr ocamlVersion ${{ matrix.setup.ocaml-version }} From 5d8279ef595576cbcb1abd8b0bd666ae29465497 Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Sat, 2 Nov 2024 19:40:23 -0700 Subject: [PATCH 2/2] rm 5.0 --- .github/workflows/nix-build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/nix-build.yml b/.github/workflows/nix-build.yml index 0e465a0b2..9ee7812d6 100644 --- a/.github/workflows/nix-build.yml +++ b/.github/workflows/nix-build.yml @@ -43,7 +43,6 @@ jobs: setup: - {ocaml-version: '5_2', os: macos-13} - {ocaml-version: '4_14', os: macos-14} - - {ocaml-version: '5_0', os: macos-14} - {ocaml-version: '5_2', os: macos-14} runs-on: ${{ matrix.setup.os }} steps: