Update go.yml for GitHub Actions to use the arm64 hosted runners

emic · Jan 18, 2025 · 626dced · 626dced
1 parent eb3275b
commit 626dced
Showing 1 changed file with 12 additions and 19 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         # https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners
-        os: [ 'ubuntu-20.04', 'ubuntu-22.04', 'ubuntu-24.04', 'ubuntu-latest', 'macos-13', 'macos-14', 'macos-15', 'macos-latest', 'windows-2019', 'windows-2022', 'windows-latest' ]
+        os: [ 'ubuntu-20.04', 'ubuntu-22.04', 'ubuntu-22.04-arm', 'ubuntu-24.04', 'ubuntu-24.04-arm', 'ubuntu-latest', 'macos-13', 'macos-14', 'macos-15', 'macos-latest', 'windows-2019', 'windows-2022', 'windows-latest' ]
     steps:
 
     - uses: actions/checkout@v4
@@ -33,9 +33,6 @@ jobs:
     - if: runner.os == 'macOS'
       run: make dist && cp -p "dist/fmcsadmin-${{ env.fmcsadmin_version }}-macos/fmcsadmin" .
 
-    - if: runner.os == 'Linux' && matrix.os == 'ubuntu-24.04'
-      run: make build-linux-arm64
-
     - shell: bash
       run: echo "goss_commit_hash=5704120d25902119cb1139e04bca3db7742a9f73" >> "$GITHUB_ENV" # v0.4.9
 
@@ -82,15 +79,24 @@ jobs:
            mv goss-windows-amd64.exe release/
            cd ..
 
-    - if: runner.os == 'Linux' && (github.repository_owner == 'emic' || github.repository_owner == 'matsuo')
+    - if: (matrix.os == 'ubuntu-22.04' || matrix.os == 'ubuntu-24.04' || matrix.os == 'ubuntu-latest') && (github.repository_owner == 'emic' || github.repository_owner == 'matsuo')
       run: |
            ./goss-linux-amd64 --version
            OS=linux ./goss-linux-amd64 --gossfile tests/goss.yaml validate --format documentation
 
-    - if: runner.os == 'Linux' && !(github.repository_owner == 'emic' || github.repository_owner == 'matsuo')
+    - if: (matrix.os == 'ubuntu-22.04' || matrix.os == 'ubuntu-24.04' || matrix.os == 'ubuntu-latest') && !(github.repository_owner == 'emic' || github.repository_owner == 'matsuo')
       run: |
            OS=linux "./goss-${{ env.goss_commit_hash }}/release/goss-linux-amd64" --gossfile tests/goss.yaml validate --format documentation
 
+    - if: (matrix.os == 'ubuntu-22.04-arm' || matrix.os == 'ubuntu-24.04-arm') && (github.repository_owner == 'emic' || github.repository_owner == 'matsuo')
+      run: |
+           ./goss-linux-arm64 --version
+           OS=linux ./goss-linux-arm64 --gossfile tests/goss.yaml validate --format documentation
+
+    - if: (matrix.os == 'ubuntu-22.04-arm' || matrix.os == 'ubuntu-24.04-arm') && !(github.repository_owner == 'emic' || github.repository_owner == 'matsuo')
+      run: |
+           OS=linux "./goss-${{ env.goss_commit_hash }}/release/goss-linux-arm64" --gossfile tests/goss.yaml validate --format documentation
+
     - if: runner.os == 'macOS'
       run: |
            OS=darwin "./goss-${{ env.goss_commit_hash }}/release/goss-darwin-amd64" --gossfile tests/goss.yaml validate --format documentation
@@ -102,19 +108,6 @@ jobs:
 
     - run: ./fmcsadmin -v
 
-    - if: runner.os == 'Linux' && matrix.os == 'ubuntu-24.04'
-      name: Set up QEMU
-      uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
-
-    - if: ${{ false }} 
-      run: |
-           docker run --rm --env GOSS_COMMIT_HASH=${{ env.goss_commit_hash }} -i -v /$(pwd):/tmp arm64v8/ubuntu:24.04 bash <<'EOF'
-           cd /tmp
-           cp -p ./dist/linux-arm64/fmcsadmin ./fmcsadmin
-           OS=linux "./goss-linux-arm64" --gossfile tests/goss.yaml validate --format documentation
-           ./fmcsadmin -v
-           EOF
-
     - name: Create dmg format file for macOS
       if: runner.os == 'macOS'
       run: |