From d6c2f5b78803207e177e2f3d3d2d2899df69c6f2 Mon Sep 17 00:00:00 2001 From: Sander Date: Wed, 15 May 2024 09:08:51 +0000 Subject: [PATCH 1/4] ci: switch to macos-13 --- .github/workflows/test.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f342540..b82084b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,7 +9,7 @@ jobs: simple-build: strategy: matrix: - os: [ubuntu-latest, macos-latest] + os: [ubuntu-latest, macos-13] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 @@ -25,7 +25,7 @@ jobs: custom-nix-path: strategy: matrix: - os: [ubuntu-latest, macos-latest] + os: [ubuntu-latest, macos-13] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 @@ -39,7 +39,7 @@ jobs: extra-nix-config: strategy: matrix: - os: [ubuntu-latest, macos-latest] + os: [ubuntu-latest, macos-13] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 @@ -55,7 +55,7 @@ jobs: flakes: strategy: matrix: - os: [ubuntu-latest, macos-latest] + os: [ubuntu-latest, macos-13] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 @@ -66,7 +66,7 @@ jobs: installer-options: strategy: matrix: - os: [ubuntu-latest, macos-latest] + os: [ubuntu-latest, macos-13] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 @@ -81,7 +81,7 @@ jobs: oldest-supported-installer: strategy: matrix: - os: [ubuntu-latest, macos-latest] + os: [ubuntu-latest, macos-13] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 From 529d65921746c2b43d8a8a0458544a4a51f6ddc3 Mon Sep 17 00:00:00 2001 From: Sander Date: Wed, 15 May 2024 09:23:14 +0000 Subject: [PATCH 2/4] ci: add aarch64-darwin tests where possible --- .github/workflows/test.yml | 43 ++++++++++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b82084b..d286f21 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,8 +8,12 @@ on: jobs: simple-build: strategy: + fail-fast: false matrix: - os: [ubuntu-latest, macos-13] + os: + - ubuntu-latest + - macos-latest + - macos-13 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 @@ -22,10 +26,15 @@ jobs: # cachix should be available and be able to configure a cache - run: cachix use cachix - run: nix-build test.nix + custom-nix-path: strategy: + fail-fast: false matrix: - os: [ubuntu-latest, macos-13] + os: + - ubuntu-latest + - macos-latest + - macos-13 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 @@ -38,8 +47,12 @@ jobs: extra-nix-config: strategy: + fail-fast: false matrix: - os: [ubuntu-latest, macos-13] + os: + - ubuntu-latest + - macos-latest + - macos-13 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 @@ -54,8 +67,12 @@ jobs: flakes: strategy: + fail-fast: false matrix: - os: [ubuntu-latest, macos-13] + os: + - ubuntu-latest + - macos-latest + - macos-13 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 @@ -65,8 +82,12 @@ jobs: installer-options: strategy: + fail-fast: false matrix: - os: [ubuntu-latest, macos-13] + os: + - ubuntu-latest + # - macos-latest missing installer for aarch64-darwin + - macos-13 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 @@ -80,8 +101,12 @@ jobs: oldest-supported-installer: strategy: - matrix: - os: [ubuntu-latest, macos-13] + fail-fast: false + matrix: + os: + - ubuntu-latest + - macos-latest + - macos-13 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 @@ -94,8 +119,8 @@ jobs: act-support: strategy: - matrix: - os: [ubuntu-latest] + matrix: + os: [ubuntu-latest] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 From 2f469017fc567f1b7fe6d1d7c21021c02ad55105 Mon Sep 17 00:00:00 2001 From: Sander Date: Wed, 15 May 2024 09:28:22 +0000 Subject: [PATCH 3/4] ci: update nixpkgs channel --- .github/workflows/test.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d286f21..97da5c3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,6 +5,9 @@ on: branches: - master +env: + nixpkgs_channel: nixpkgs=channel:nixos-23.11 + jobs: simple-build: strategy: @@ -20,7 +23,7 @@ jobs: - name: Install Nix uses: ./ with: - nix_path: nixpkgs=channel:nixos-22.11 + nix_path: ${{ env.nixpkgs_channel }} - run: nix-env -iA cachix -f https://cachix.org/api/v1/install - run: cat /etc/nix/nix.conf # cachix should be available and be able to configure a cache @@ -41,8 +44,8 @@ jobs: - name: Install Nix uses: ./ with: - nix_path: nixpkgs=channel:nixos-20.03 - - run: test $NIX_PATH == "nixpkgs=channel:nixos-20.03" + nix_path: ${{ env.nixpkgs_channel }} + - run: test $NIX_PATH == '${{ env.nixpkgs_channel }}' - run: nix-build test.nix extra-nix-config: @@ -59,7 +62,7 @@ jobs: - name: Install Nix uses: ./ with: - nix_path: nixpkgs=channel:nixos-22.11 + nix_path: ${{ env.nixpkgs_channel }} extra_nix_config: | sandbox = relaxed - run: cat /etc/nix/nix.conf @@ -94,7 +97,7 @@ jobs: - name: Install Nix uses: ./ with: - nix_path: nixpkgs=channel:nixos-22.11 + nix_path: ${{ env.nixpkgs_channel }} install_options: --tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve install_url: https://nixos-nix-install-tests.cachix.org/serve/s62m7lc0q0mz2mxxm9q0kkrcg90njzhq/install - run: nix-build test.nix @@ -113,7 +116,7 @@ jobs: - name: Install Nix uses: ./ with: - nix_path: nixpkgs=channel:nixos-22.11 + nix_path: ${{ env.nixpkgs_channel }} install_url: https://releases.nixos.org/nix/nix-2.8.0/install - run: nix-build test.nix From d9660bf088514a2ede4707708ba35de0a1b69a3d Mon Sep 17 00:00:00 2001 From: Sander Date: Wed, 15 May 2024 10:54:08 +0000 Subject: [PATCH 4/4] ci: updated pinned installer --- .github/workflows/test.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 97da5c3..a31337f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,6 +7,10 @@ on: env: nixpkgs_channel: nixpkgs=channel:nixos-23.11 + oldest_supported_installer: nix-2.8.0 + # Fetch new versions from the Nix CI run: https://github.com/NixOS/nix/blob/master/.github/workflows/ci.yml + # TODO: add pinning upstream or rethink this + pinned_installer_hash: zfzfrbb59jsqrfkldwj8drcr9nhhc49k jobs: simple-build: @@ -99,7 +103,7 @@ jobs: with: nix_path: ${{ env.nixpkgs_channel }} install_options: --tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve - install_url: https://nixos-nix-install-tests.cachix.org/serve/s62m7lc0q0mz2mxxm9q0kkrcg90njzhq/install + install_url: https://nixos-nix-install-tests.cachix.org/serve/${{ env.pinned_installer_hash }}/install - run: nix-build test.nix oldest-supported-installer: @@ -117,7 +121,7 @@ jobs: uses: ./ with: nix_path: ${{ env.nixpkgs_channel }} - install_url: https://releases.nixos.org/nix/nix-2.8.0/install + install_url: https://releases.nixos.org/nix/${{ env.oldest_supported_installer }}/install - run: nix-build test.nix act-support: