From 9cb84136021796647885afa9b04646ce6bf72a55 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Fri, 27 Jan 2023 23:52:28 -0700 Subject: [PATCH] .github: Remove Nix matrix --- .github/workflows/build.yml | 7 +------ .github/workflows/linters.yml | 6 ------ .github/workflows/manual-stable.yml | 6 ------ .github/workflows/manual.yml | 6 ------ .github/workflows/tests.yml | 12 +----------- 5 files changed, 2 insertions(+), 35 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index becb454..61ed3b9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,11 +11,8 @@ jobs: image: ubuntu-latest - label: macOS image: macos-12 - nix: - - version: 2.13.2 - url: https://releases.nixos.org/nix/nix-2.13.2/install - name: ${{ matrix.os.label }} + Nix ${{ matrix.nix.version }} + name: ${{ matrix.os.label }} runs-on: ${{ matrix.os.image }} steps: - uses: actions/checkout@v3.3.0 @@ -31,11 +28,9 @@ jobs: - name: Build Colmena run: nix build -L - if: ${{ !contains(matrix.nix.version, '2.3') }} - name: Build and install Colmena with flake-compat run: nix-env -if default.nix - name: Build manual run: nix build .#manual -L - if: ${{ !contains(matrix.nix.version, '2.3') && runner.os != 'macOS' }} diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml index 27c279f..63e68ba 100644 --- a/.github/workflows/linters.yml +++ b/.github/workflows/linters.yml @@ -9,12 +9,6 @@ jobs: runs-on: ubuntu-latest - strategy: - matrix: - nix: - - version: 2.13.2 - url: https://releases.nixos.org/nix/nix-2.13.2/install - steps: - uses: actions/checkout@v3.3.0 diff --git a/.github/workflows/manual-stable.yml b/.github/workflows/manual-stable.yml index 64b6f13..1df48c0 100644 --- a/.github/workflows/manual-stable.yml +++ b/.github/workflows/manual-stable.yml @@ -15,12 +15,6 @@ jobs: runs-on: ubuntu-latest if: github.repository == 'zhaofengli/colmena' - strategy: - matrix: - nix: - - version: 2.13.2 - url: https://releases.nixos.org/nix/nix-2.13.2/install - steps: - uses: actions/checkout@v3.3.0 diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml index 34c70f3..eb774ec 100644 --- a/.github/workflows/manual.yml +++ b/.github/workflows/manual.yml @@ -15,12 +15,6 @@ jobs: runs-on: ubuntu-latest if: github.repository == 'zhaofengli/colmena' - strategy: - matrix: - nix: - - version: 2.13.2 - url: https://releases.nixos.org/nix/nix-2.13.2/install - steps: - uses: actions/checkout@v3.3.0 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 51a4bfc..0ef41ca 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -9,15 +9,8 @@ jobs: os: - label: Linux image: ubuntu-latest - nix: - - version: 2.3.16 - url: https://releases.nixos.org/nix/nix-2.3.16/install - - version: 2.4 - url: https://releases.nixos.org/nix/nix-2.4/install - - version: 2.13.2 - url: https://releases.nixos.org/nix/nix-2.13.2/install - name: ${{ matrix.os.label }} + Nix ${{ matrix.nix.version }} + name: ${{ matrix.os.label }} runs-on: ${{ matrix.os.image }} steps: - uses: actions/checkout@v3.3.0 @@ -37,6 +30,3 @@ jobs: run: echo "NIX_PATH=nixpkgs=$(nix-instantiate --eval flake-compat.nix -A defaultNix.inputs.nixpkgs.outPath | sed 's|\"||g')" >> $GITHUB_ENV - run: nix-shell --run "cargo test" - if: ${{ !contains(matrix.nix.version, '2.3') }} - - run: nix-shell --run "cargo test -- --skip flake" - if: ${{ contains(matrix.nix.version, '2.3') }}