test runners

Signed-off-by: Alex Bozarth <[email protected]>
ajbozarth · Dec 9, 2024 · 67da71f · 67da71f
1 parent f3eb20a
commit 67da71f
Showing 1 changed file with 13 additions and 17 deletions.
diff --git a/.github/workflows/openssl3.yml b/.github/workflows/openssl3.yml
@@ -2,7 +2,7 @@ name: openssl3
 
 on:
   push:
-    branches: [ 'main' ]
+    branches: [ '*' ]
     paths: ['.github/workflows/openssl3.yml', 'openssl3/**']
   pull_request:
     branches: [ 'main' ]
@@ -38,22 +38,20 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        platform:
-          - linux/amd64
-          - linux/arm64
+        os:
+          - ubuntu-latest
+          - macos-latest
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
-      - uses: docker/setup-qemu-action@v3
-      - uses: docker/setup-buildx-action@v3
-      - uses: docker/login-action@v3
-        if: env.push == 'true'
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      # - uses: docker/login-action@v3
+      #   if: env.push == 'true'
+      #   with:
+      #     username: ${{ secrets.DOCKERHUB_USERNAME }}
+      #     password: ${{ secrets.DOCKERHUB_TOKEN }}
       - uses: docker/login-action@v3
         with:
           registry: ghcr.io
@@ -65,7 +63,6 @@ jobs:
         with:
           load: true
           context: openssl3
-          platforms: ${{ matrix.platform }}
           build-args: |
             MAKE_DEFINES=-j4
             ${{ (inputs.build_main == 'true') && env.build-args || null }}
@@ -77,15 +74,14 @@ jobs:
           docker run --rm --name oqs-ossl3 oqs-ossl3 sh -c "KEM_ALG=p521_frodo1344aes /opt/openssl32/bin/serverstart.sh; sleep 2; echo 'GET /' | openssl s_client -connect localhost --groups p521_frodo1344aes --CAfile /opt/openssl32/bin/CA.crt"
 
       - name: Push Docker image to registries
-        if: env.push == 'true'
+      #  if: env.push == 'true'
         uses: docker/build-push-action@v6
         with:
           push: true
           context: openssl3
-          platforms: ${{ matrix.platform }}
           build-args: |
             MAKE_DEFINES=-j4
             ${{ (inputs.build_main == 'true') && env.build-args || null }}
           tags: |
-            openquantumsafe/openssl3:${{ inputs.release_tag || 'latest' }}
-            ghcr.io/open-quantum-safe/openssl3:${{ inputs.release_tag || 'latest' }}
+            ghcr.io/open-quantum-safe/openssl3:${{ (matrix.os == 'ubuntu-latest') && 'x86' || 'arm' }}-${{ inputs.release_tag || 'latest' }}
+      #      openquantumsafe/openssl3:${{ (matrix.os == 'ubuntu-latest') && 'x86' || 'arm' }}-${{ inputs.release_tag || 'latest' }}