Tweak actions config to use different key names in matrix

houseabsolute · Oct 13, 2024 · 0b8154a · 0b8154a
1 parent 836e2cd
commit 0b8154a
Showing 1 changed file with 38 additions and 38 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,8 +15,8 @@ env:
 
 jobs:
   test:
-    name: ${{ matrix.platform.os_name }} with rust ${{ matrix.toolchain }}
-    runs-on: ${{ matrix.platform.os }}
+    name: ${{ matrix.platform.os-name }} with rust ${{ matrix.toolchain }}
+    runs-on: ${{ matrix.platform.runs-on }}
     strategy:
       fail-fast: false
       matrix:
@@ -26,107 +26,107 @@ jobs:
           # - sparc64-unknown-linux-gnu - cannot compile openssl-sys
           # - x86_64-unknown-illumos - weird error compiling openssl - "bin/sh: 1: granlib: not found"
 
-          - os_name: FreeBSD-x86_64
-            os: ubuntu-20.04
+          - os-name: FreeBSD-x86_64
+            runs-on: ubuntu-20.04
             target: x86_64-unknown-freebsd
             bin: precious
             name: precious-FreeBSD-x86_64.tar.gz
             skip_tests: true
-          - os_name: Linux-x86_64
-            os: ubuntu-20.04
+          - os-name: Linux-x86_64
+            runs-on: ubuntu-20.04
             target: x86_64-unknown-linux-musl
             bin: precious
             name: precious-Linux-x86_64-musl.tar.gz
-          - os_name: Linux-aarch64
-            os: ubuntu-20.04
+          - os-name: Linux-aarch64
+            runs-on: ubuntu-20.04
             target: aarch64-unknown-linux-musl
             bin: precious
             name: precious-Linux-aarch64-musl.tar.gz
-          - os_name: Linux-arm
-            os: ubuntu-20.04
+          - os-name: Linux-arm
+            runs-on: ubuntu-20.04
             target: arm-unknown-linux-musleabi
             bin: precious
             name: precious-Linux-arm-musl.tar.gz
-          - os_name: Linux-i686
-            os: ubuntu-20.04
+          - os-name: Linux-i686
+            runs-on: ubuntu-20.04
             target: i686-unknown-linux-musl
             bin: precious
             name: precious-Linux-i686-musl.tar.gz
             skip_tests: true
-          - os_name: Linux-powerpc
-            os: ubuntu-20.04
+          - os-name: Linux-powerpc
+            runs-on: ubuntu-20.04
             target: powerpc-unknown-linux-gnu
             bin: precious
             name: precious-Linux-powerpc-gnu.tar.gz
             skip_tests: true
-          - os_name: Linux-powerpc64
-            os: ubuntu-20.04
+          - os-name: Linux-powerpc64
+            runs-on: ubuntu-20.04
             target: powerpc64-unknown-linux-gnu
             bin: precious
             name: precious-Linux-powerpc64-gnu.tar.gz
             skip_tests: true
-          - os_name: Linux-powerpc64le
-            os: ubuntu-20.04
+          - os-name: Linux-powerpc64le
+            runs-on: ubuntu-20.04
             target: powerpc64le-unknown-linux-gnu
             bin: precious
             name: precious-Linux-powerpc64le.tar.gz
             skip_tests: true
-          - os_name: Linux-riscv64
-            os: ubuntu-20.04
+          - os-name: Linux-riscv64
+            runs-on: ubuntu-20.04
             target: riscv64gc-unknown-linux-gnu
             bin: precious
             name: precious-Linux-riscv64gc-gnu.tar.gz
-          - os_name: Linux-s390x
-            os: ubuntu-20.04
+          - os-name: Linux-s390x
+            runs-on: ubuntu-20.04
             target: s390x-unknown-linux-gnu
             bin: precious
             name: precious-Linux-s390x-gnu.tar.gz
             skip_tests: true
-          - os_name: NetBSD-x86_64
-            os: ubuntu-20.04
+          - os-name: NetBSD-x86_64
+            runs-on: ubuntu-20.04
             target: x86_64-unknown-netbsd
             bin: precious
             name: precious-NetBSD-x86_64.tar.gz
             skip_tests: true
-          - os_name: Windows-aarch64
-            os: windows-latest
+          - os-name: Windows-aarch64
+            runs-on: windows-latest
             target: aarch64-pc-windows-msvc
             bin: precious.exe
             name: precious-Windows-aarch64.zip
             skip_tests: true
-          - os_name: Windows-i686
-            os: windows-latest
+          - os-name: Windows-i686
+            runs-on: windows-latest
             target: i686-pc-windows-msvc
             bin: precious.exe
             name: precious-Windows-i686.zip
             skip_tests: true
-          - os_name: Windows-x86_64
-            os: windows-latest
+          - os-name: Windows-x86_64
+            runs-on: windows-latest
             target: x86_64-pc-windows-msvc
             bin: precious.exe
             name: precious-Windows-x86_64.zip
-          - os_name: macOS-x86_64
-            os: macOS-latest
+          - os-name: macOS-x86_64
+            runs-on: macOS-latest
             target: x86_64-apple-darwin
             bin: precious
             name: precious-Darwin-x86_64.tar.gz
-          - os_name: macOS-aarch64
-            os: macOS-latest
+          - os-name: macOS-aarch64
+            runs-on: macOS-latest
             target: aarch64-apple-darwin
             bin: precious
             name: precious-Darwin-aarch64.tar.gz
         toolchain:
           - stable
         include:
           - platform:
-              os_name: Linux-x86_64
-              os: ubuntu-20.04
+              os-name: Linux-x86_64
+              runs-on: ubuntu-20.04
               target: x86_64-unknown-linux-musl
               bin: precious
             toolchain: beta
           - platform:
-              os_name: Linux-x86_64
-              os: ubuntu-20.04
+              os-name: Linux-x86_64
+              runs-on: ubuntu-20.04
               target: x86_64-unknown-linux-musl
               bin: precious
             toolchain: nightly