Test QEMU 8

instrumentisto · Oct 25, 2023 · 576696a · 576696a
1 parent bab77cc
commit 576696a
Showing 1 changed file with 17 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -31,26 +31,29 @@ jobs:
           - arm64v8
           - ppc64le
           - s390x
-    runs-on: ${{ (contains('arm32v6 arm32v7 s390x', matrix.arch)
-                  && 'macos')
-                  || 'ubuntu' }}-latest
+    #runs-on: ${{ (contains('arm32v6 arm32v7 s390x', matrix.arch)
+    #              && 'macos')
+    #              || 'ubuntu' }}-latest
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0  # for correct image labeling via `git describe --tags`
-      - name: Setup Docker for MacOS
-        run: |
-          set -ex
-          brew install colima docker docker-buildx
-          mkdir -p /Users/runner/.docker/cli-plugins/
-          ln -sfn /usr/local/opt/docker-buildx/bin/docker-buildx \
-                  /Users/runner/.docker/cli-plugins/docker-buildx
-          colima start
-        if: ${{ contains('arm32v6 arm32v7 s390x', matrix.arch) }}
+      #- name: Setup Docker for MacOS
+      #  run: |
+      #    set -ex
+      #    brew install colima docker docker-buildx
+      #    mkdir -p /Users/runner/.docker/cli-plugins/
+      #    ln -sfn /usr/local/opt/docker-buildx/bin/docker-buildx \
+      #            /Users/runner/.docker/cli-plugins/docker-buildx
+      #    colima start
+      #  if: ${{ contains('arm32v6 arm32v7 s390x', matrix.arch) }}
       - uses: docker/setup-qemu-action@v3
-        if: ${{ contains('arm32v6 arm32v7 s390x', matrix.arch) }}
+        with:
+          image: tonistiigi/binfmt:master
+      #  if: ${{ contains('arm32v6 arm32v7 s390x', matrix.arch) }}
       - uses: docker/setup-buildx-action@v3
-        if: ${{ !contains('arm32v6 arm32v7 s390x', matrix.arch) }}
+      #  if: ${{ !contains('arm32v6 arm32v7 s390x', matrix.arch) }}
 
       - run: make docker.image no-cache=yes
                   platform=${{ matrix.os }}/${{ matrix.arch }}