Update all workflows to use runner

Signed-off-by: Alex Bozarth <[email protected]>
open-quantum-safe · Dec 9, 2024 · ecc80eb · ecc80eb
1 parent cfa3cfc
commit ecc80eb
Show file tree

Hide file tree

Showing 12 changed files with 219 additions and 129 deletions.
diff --git a/.github/workflows/curl.yml b/.github/workflows/curl.yml
@@ -38,17 +38,17 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        platform:
-          - linux/amd64
-          - linux/arm64
+        include:
+          - arch: x86_64
+            runner: ubuntu-latest
+          - arch: arm64
+            runner: oqs-arm64
+    runs-on: ${{ matrix.runner }}
     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:
@@ -65,7 +65,6 @@ jobs:
         with:
           load: true
           context: curl
-          platforms: ${{ matrix.platform }}
           build-args: |
             MAKE_DEFINES=-j4
             ${{ (inputs.build_main == 'true') && env.build-args || null }}
@@ -76,7 +75,6 @@ jobs:
         with:
           load: true
           context: curl
-          platforms: ${{ matrix.platform }}
           build-args: |
             MAKE_DEFINES=-j4
             ${{ (inputs.build_main == 'true') && env.build-args || null }}
@@ -88,7 +86,6 @@ jobs:
         with:
           load: true
           context: curl
-          platforms: ${{ matrix.platform }}
           build-args: |
             MAKE_DEFINES=-j4
             LIBOQS_BUILD_DEFINES="-DOQS_OPT_TARGET=generic"
@@ -106,40 +103,55 @@ jobs:
         with:
           push: true
           context: curl
-          platforms: ${{ matrix.platform }}
           build-args: |
             MAKE_DEFINES=-j4
             ${{ (inputs.build_main == 'true') && env.build-args || null }}
           tags: |
-            ghcr.io/${{ github.repository_owner }}/curl:optimized
-            openquantumsafe/curl:optimized
+            ghcr.io/${{ github.repository_owner }}/curl:optimized-${{ matrix.arch }}
+            openquantumsafe/curl:optimized-${{ matrix.arch }}
 
       - name: Push Docker image to registries (dev)
         if: env.push == 'true'
         uses: docker/build-push-action@v6
         with:
           push: true
           context: curl
-          platforms: ${{ matrix.platform }}
           build-args: |
             MAKE_DEFINES=-j4
             ${{ (inputs.build_main == 'true') && env.build-args || null }}
           target: dev
           tags: |
-            ghcr.io/${{ github.repository_owner }}/curl-dev
-            openquantumsafe/curl-dev
+            ghcr.io/${{ github.repository_owner }}/curl-dev:latest-${{ matrix.arch }}
+            openquantumsafe/curl-dev:latest-${{ matrix.arch }}
 
       - name: Push Docker image to registries (with generic liboqs)
         if: env.push == 'true'
         uses: docker/build-push-action@v6
         with:
           push: true
           context: curl
-          platforms: ${{ matrix.platform }}
           build-args: |
             MAKE_DEFINES=-j4
             LIBOQS_BUILD_DEFINES="-DOQS_OPT_TARGET=generic"
             ${{ (inputs.build_main == 'true') && env.build-args || null }}
           tags: |
-            ghcr.io/${{ github.repository_owner }}/curl:${{ inputs.release_tag || 'latest' }}
-            openquantumsafe/curl:${{ inputs.release_tag || 'latest' }}
+            ghcr.io/${{ github.repository_owner }}/curl:${{ inputs.release_tag || 'latest' }}-${{ matrix.arch }}
+            openquantumsafe/curl:${{ inputs.release_tag || 'latest' }}-${{ matrix.arch }}
+
+  push:
+    if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' }}
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: ./.github/workflows/manifest
+        with:
+          image_name: curl
+          release_tag: optimized
+      - uses: ./.github/workflows/manifest
+        with:
+          image_name: curl-dev
+          release_tag: latest
+      - uses: ./.github/workflows/manifest
+        with:
+          image_name: curl
+          release_tag: ${{ inputs.release_tag || 'latest' }}
diff --git a/.github/workflows/h2load.yml b/.github/workflows/h2load.yml
@@ -38,17 +38,17 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        platform:
-          - linux/amd64
-          - linux/arm64
+        include:
+          - arch: x86_64
+            runner: ubuntu-latest
+          - arch: arm64
+            runner: oqs-arm64
+    runs-on: ${{ matrix.runner }}
     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:
@@ -65,7 +65,6 @@ jobs:
         with:
           load: true
           context: h2load
-          platforms: ${{ matrix.platform }}
           build-args: |
             ${{ (inputs.build_main == 'true') && env.build-args || null }}
           tags: oqs-h2load
@@ -75,7 +74,6 @@ jobs:
         with:
           load: true
           context: nginx
-          platforms: ${{ matrix.platform }}
           build-args: |
             MAKE_DEFINES=-j4
             ${{ (inputs.build_main == 'true') && env.build-args || null }}
@@ -93,9 +91,18 @@ jobs:
         with:
           push: true
           context: h2load
-          platforms: ${{ matrix.platform }}
           build-args: |
             ${{ (inputs.build_main == 'true') && env.build-args || null }}
           tags: |
-            ghcr.io/${{ github.repository_owner }}/h2load:${{ inputs.release_tag || 'latest' }}
-            openquantumsafe/h2load:${{ inputs.release_tag || 'latest' }}
+            ghcr.io/${{ github.repository_owner }}/h2load:${{ inputs.release_tag || 'latest' }}-${{ matrix.arch }}
+            openquantumsafe/h2load:${{ inputs.release_tag || 'latest' }}-${{ matrix.arch }}
+
+  push:
+    if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' }}
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: ./.github/workflows/manifest
+        with:
+          image_name: h2load
+          release_tag: ${{ inputs.release_tag || 'latest' }}
diff --git a/.github/workflows/haproxy.yml b/.github/workflows/haproxy.yml
@@ -38,17 +38,17 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        platform:
-          - linux/amd64
-          - linux/arm64
+        include:
+          - arch: x86_64
+            runner: ubuntu-latest
+          - arch: arm64
+            runner: oqs-arm64
+    runs-on: ${{ matrix.runner }}
     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:
@@ -65,7 +65,6 @@ jobs:
         with:
           load: true
           context: haproxy
-          platforms: ${{ matrix.platform }}
           build-args: |
             MAKE_DEFINES=-j4
             ${{ (inputs.build_main == 'true') && env.build-args || null }}
@@ -76,7 +75,6 @@ jobs:
         with:
           load: true
           context: curl
-          platforms: ${{ matrix.platform }}
           build-args: |
             MAKE_DEFINES=-j4
             ${{ (inputs.build_main == 'true') && env.build-args || null }}
@@ -95,10 +93,19 @@ jobs:
         with:
           push: true
           context: haproxy
-          platforms: ${{ matrix.platform }}
           build-args: |
             MAKE_DEFINES=-j4
             ${{ (inputs.build_main == 'true') && env.build-args || null }}
           tags: |
-            ghcr.io/${{ github.repository_owner }}/haproxy:${{ inputs.release_tag || 'latest' }}
-            openquantumsafe/haproxy:${{ inputs.release_tag || 'latest' }}
+            ghcr.io/${{ github.repository_owner }}/haproxy:${{ inputs.release_tag || 'latest' }}-${{ matrix.arch }}
+            openquantumsafe/haproxy:${{ inputs.release_tag || 'latest' }}-${{ matrix.arch }}
+
+  push:
+    if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' }}
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: ./.github/workflows/manifest
+        with:
+          image_name: haproxy
+          release_tag: ${{ inputs.release_tag || 'latest' }}
diff --git a/.github/workflows/httpd.yml b/.github/workflows/httpd.yml
@@ -38,17 +38,17 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        platform:
-          - linux/amd64
-          - linux/arm64
+        include:
+          - arch: x86_64
+            runner: ubuntu-latest
+          - arch: arm64
+            runner: oqs-arm64
+    runs-on: ${{ matrix.runner }}
     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:
@@ -65,7 +65,6 @@ jobs:
         with:
           load: true
           context: httpd
-          platforms: ${{ matrix.platform }}
           build-args: |
             MAKE_DEFINES=-j4
             ${{ (inputs.build_main == 'true') && env.build-args || null }}
@@ -76,7 +75,6 @@ jobs:
         with:
           load: true
           context: curl
-          platforms: ${{ matrix.platform }}
           build-args: |
             MAKE_DEFINES=-j4
             ${{ (inputs.build_main == 'true') && env.build-args || null }}
@@ -95,10 +93,19 @@ jobs:
         with:
           push: true
           context: httpd
-          platforms: ${{ matrix.platform }}
           build-args: |
             MAKE_DEFINES=-j4
             ${{ (inputs.build_main == 'true') && env.build-args || null }}
           tags: |
-            ghcr.io/${{ github.repository_owner }}/httpd:${{ inputs.release_tag || 'latest' }}
-            openquantumsafe/httpd:${{ inputs.release_tag || 'latest' }}
+            ghcr.io/${{ github.repository_owner }}/httpd:${{ inputs.release_tag || 'latest' }}-${{ matrix.arch }}
+            openquantumsafe/httpd:${{ inputs.release_tag || 'latest' }}-${{ matrix.arch }}
+
+  push:
+    if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' }}
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: ./.github/workflows/manifest
+        with:
+          image_name: httpd
+          release_tag: ${{ inputs.release_tag || 'latest' }}
diff --git a/.github/workflows/locust.yml b/.github/workflows/locust.yml
@@ -38,17 +38,17 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        platform:
-          - linux/amd64
-          - linux/arm64
+        include:
+          - arch: x86_64
+            runner: ubuntu-latest
+          - arch: arm64
+            runner: oqs-arm64
+    runs-on: ${{ matrix.runner }}
     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:
@@ -65,7 +65,6 @@ jobs:
         with:
           load: true
           context: locust
-          platforms: ${{ matrix.platform }}
           build-args: |
             MAKE_DEFINES=-j4
             ${{ (inputs.build_main == 'true') && env.build-args || null }}
@@ -118,10 +117,19 @@ jobs:
         with:
           push: true
           context: locust
-          platforms: ${{ matrix.platform }}
           build-args: |
             MAKE_DEFINES=-j4
             ${{ (inputs.build_main == 'true') && env.build-args || null }}
           tags: |
-            ghcr.io/${{ github.repository_owner }}/locust:${{ inputs.release_tag || 'latest' }}
-            openquantumsafe/locust:${{ inputs.release_tag || 'latest' }}
+            ghcr.io/${{ github.repository_owner }}/locust:${{ inputs.release_tag || 'latest' }}-${{ matrix.arch }}
+            openquantumsafe/locust:${{ inputs.release_tag || 'latest' }}-${{ matrix.arch }}
+
+  push:
+    if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' }}
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: ./.github/workflows/manifest
+        with:
+          image_name: locust
+          release_tag: ${{ inputs.release_tag || 'latest' }}