chore(ci): Drop -linux suffix everywhere.

vifino · Jan 31, 2024 · 87eddd7 · 87eddd7
1 parent b53b410
commit 87eddd7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
@@ -14,23 +14,23 @@ jobs:
         # aarch64-linux and friends require emulation, which is terribly slow.
         # so slow, that the test doesn't pass.
         # TODO: set up aarch64 worker?
-        system: [x86_64-linux, i686-linux]
+        system: [x86_64, i686]
         check: [loop, tcp, rdma]
         exclude:
           # Failed to find module 'rdma_rxe'
-          - system: i686-linux
+          - system: i686
             check: rdma
     name: ${{ matrix.system }} - ${{ matrix.check }}
     steps:
     - uses: actions/checkout@v3
     - name: Setup QEMU User and binfmt
       uses: docker/setup-qemu-action@v3
-      if: ${{ matrix.system != 'x86_64-linux' && matrix.system != 'i686-linux' }}
+      if: ${{ matrix.system != 'x86_64' && matrix.system != 'i686' }}
     - name: Install Nix
       uses: DeterminateSystems/nix-installer-action@main
       with:
-        extra-conf: "extra-platforms = ${{ matrix.system }}"
+        extra-conf: "extra-platforms = ${{ matrix.system }}-linux"
     - name: Setup Magic Nix cache
       uses: DeterminateSystems/magic-nix-cache-action@main
     - name: Run Flake Check
-      run: nix build -L .#checks.${{ matrix.system }}.${{ matrix.check }}
+      run: nix build -L .#checks.${{ matrix.system }}-linux.${{ matrix.check }}
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -11,23 +11,24 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        system: [x86_64-linux, i686-linux, aarch64-linux]
+        system: [x86_64, i686, aarch64]
     name: ${{ matrix.system }}
     steps:
     - uses: actions/checkout@v3
     - name: Setup QEMU User and binfmt
       uses: docker/setup-qemu-action@v3
-      if: ${{ matrix.system != 'x86_64-linux' && matrix.system != 'i686-linux' }}
+      if: ${{ matrix.system != 'x86_64' && matrix.system != 'i686' }}
     - name: Install Nix
       uses: DeterminateSystems/nix-installer-action@main
       with:
-        extra-conf: "extra-platforms = ${{ matrix.system }}"
+        extra-conf: "extra-platforms = ${{ matrix.system }}-linux"
     - name: Setup Magic Nix cache
       uses: DeterminateSystems/magic-nix-cache-action@main
     - name: Build static binary
       run: |
-        nix build -L .#packages.${{ matrix.system }}.nvmetcfg-static
-        echo "nvmetBinary=$(nix eval --raw .#packages.${{ matrix.system }}.nvmetcfg-static)/bin/nvmet" >> $GITHUB_ENV
+        FLAKEREF=.#packages.${{ matrix.system }}-linux.nvmetcfg-static
+        nix build -L $FLAKEREF
+        echo "nvmetBinary=$(nix eval --raw $FLAKEREF)/bin/nvmet" >> $GITHUB_ENV
     - name: Upload workflow artifacts
       uses: actions/upload-artifact@v4
       with: