use runner.os instead of uname -s

Kleidukos · Sep 16, 2024 · a33a4d3 · a33a4d3
1 parent 2254c2f
commit a33a4d3
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -47,9 +47,7 @@ jobs:
         run: |
           ARCHITECTURE=$(uname -m)
           echo "ARCH=$ARCHITECTURE" >> $GITHUB_ENV
-          KERNEL=$(uname -s)
-          echo "KERNEL=$KERNEL" >> $GITHUB_ENV
-          echo "REPORT_NAME=report-$KERNEL-ghc-${{ matrix.ghc }}.xml" >> $GITHUB_ENV
+          echo "REPORT_NAME=report-${{ runner.os }}-ghc-${{ matrix.ghc }}.xml" >> $GITHUB_ENV
           echo ${{ env.ARCH }}
           echo "$GITHUB_WORKSPACE/distribution" >> "$GITHUB_PATH"
           echo "REPORT_NAME=report-${{ matrix.os }}-ghc-${{ matrix.ghc }}.xml" >> $GITHUB_ENV
@@ -93,7 +91,7 @@ jobs:
       - name: Package the get-tested executable
         run: |
           executable=distribution/get-tested
-          ARTIFACT_NAME="get-tested-head-${{ env.KERNEL }}-${{ env.ARCH }}"
+          ARTIFACT_NAME="get-tested-head-${{ runner.os }}-${{ env.ARCH }}"
           echo "ARTIFACT_NAME=${ARTIFACT_NAME}" >> $GITHUB_ENV
 
       - name: Upload the get-tested executable
@@ -129,8 +127,6 @@ jobs:
         run: |
           ARCHITECTURE=$(uname -m)
           echo "ARCH=$ARCHITECTURE" >> $GITHUB_ENV
-          KERNEL=$(uname -s)
-          echo "KERNEL=$KERNEL" >> $GITHUB_ENV
           echo "REPORT_NAME=report-alpine.xml" >> $GITHUB_ENV
 
       - name: Freeze
@@ -171,7 +167,7 @@ jobs:
       - name: Tar get-tested executable
         run: |
           GETTESTED_EXEC=distribution/get-tested
-          ARTIFACT_NAME="get-tested-head-${{ env.KERNEL }}-static-${{ env.ARCH }}"
+          ARTIFACT_NAME="get-tested-head-${{ runner.os }}-static-${{ env.ARCH }}"
           echo "ARTIFACT_NAME=${ARTIFACT_NAME}" >> $GITHUB_ENV
 
       - name: Upload get-tested executable to workflow artifacts