From ecc80eb2c5df57a1ea1d13fe2eb27911ae57a881 Mon Sep 17 00:00:00 2001 From: Alex Bozarth Date: Mon, 9 Dec 2024 12:39:39 -0600 Subject: [PATCH] Update all workflows to use runner Signed-off-by: Alex Bozarth --- .github/workflows/curl.yml | 48 ++++++++++++++++++++------------- .github/workflows/h2load.yml | 29 ++++++++++++-------- .github/workflows/haproxy.yml | 29 ++++++++++++-------- .github/workflows/httpd.yml | 29 ++++++++++++-------- .github/workflows/locust.yml | 28 ++++++++++++------- .github/workflows/mosquitto.yml | 28 ++++++++++++------- .github/workflows/nginx.yml | 29 ++++++++++++-------- .github/workflows/ngtcp2.yml | 38 ++++++++++++++++---------- .github/workflows/openssh.yml | 28 ++++++++++++------- .github/workflows/openssl3.yml | 6 ++--- .github/workflows/openvpn.yml | 28 ++++++++++++------- .github/workflows/wireshark.yml | 28 ++++++++++++------- 12 files changed, 219 insertions(+), 129 deletions(-) diff --git a/.github/workflows/curl.yml b/.github/workflows/curl.yml index 2d99a0f..de62ea3 100644 --- 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,13 +103,12 @@ 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' @@ -120,14 +116,13 @@ jobs: 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' @@ -135,11 +130,28 @@ jobs: 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 index 0bbff2a..5228a1d 100644 --- 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 index 0683909..f3f25aa 100644 --- 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 index aa86a9d..5a2be7a 100644 --- 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 index f8af052..970a4b0 100644 --- 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' }} diff --git a/.github/workflows/mosquitto.yml b/.github/workflows/mosquitto.yml index 03a046f..caa3a48 100644 --- a/.github/workflows/mosquitto.yml +++ b/.github/workflows/mosquitto.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: mosquitto - platforms: ${{ matrix.platform }} build-args: | ${{ (inputs.build_main == 'true') && env.build-args || null }} tags: oqs-mosquitto @@ -86,9 +85,18 @@ jobs: with: push: true context: mosquitto - platforms: ${{ matrix.platform }} build-args: | ${{ (inputs.build_main == 'true') && env.build-args || null }} tags: | - ghcr.io/${{ github.repository_owner }}/mosquitto:${{ inputs.release_tag || 'latest' }} - openquantumsafe/mosquitto:${{ inputs.release_tag || 'latest' }} + ghcr.io/${{ github.repository_owner }}/mosquitto:${{ inputs.release_tag || 'latest' }}-${{ matrix.arch }} + openquantumsafe/mosquitto:${{ 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: mosquitto + release_tag: ${{ inputs.release_tag || 'latest' }} diff --git a/.github/workflows/nginx.yml b/.github/workflows/nginx.yml index b325f29..16b0b75 100644 --- a/.github/workflows/nginx.yml +++ b/.github/workflows/nginx.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: nginx - 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 LIBOQS_BUILD_DEFINES="-DOQS_OPT_TARGET=generic" @@ -96,10 +94,19 @@ jobs: with: push: true context: nginx - platforms: ${{ matrix.platform }} build-args: | MAKE_DEFINES=-j4 ${{ (inputs.build_main == 'true') && env.build-args || null }} tags: | - ghcr.io/${{ github.repository_owner }}/nginx:${{ inputs.release_tag || 'latest' }} - openquantumsafe/nginx:${{ inputs.release_tag || 'latest' }} + ghcr.io/${{ github.repository_owner }}/nginx:${{ inputs.release_tag || 'latest' }}-${{ matrix.arch }} + openquantumsafe/nginx:${{ 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: nginx + release_tag: ${{ inputs.release_tag || 'latest' }} diff --git a/.github/workflows/ngtcp2.yml b/.github/workflows/ngtcp2.yml index 1523ad9..3da18a8 100644 --- a/.github/workflows/ngtcp2.yml +++ b/.github/workflows/ngtcp2.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: @@ -66,7 +66,6 @@ jobs: load: true context: ngtcp2 file: ngtcp2/Dockerfile-server - platforms: ${{ matrix.platform }} build-args: | MAKE_DEFINES=-j4 ${{ (inputs.build_main == 'true') && env.build-args || null }} @@ -78,7 +77,6 @@ jobs: load: true context: ngtcp2 file: ngtcp2/Dockerfile-client - platforms: ${{ matrix.platform }} build-args: | MAKE_DEFINES=-j4 ${{ (inputs.build_main == 'true') && env.build-args || null }} @@ -98,13 +96,12 @@ jobs: push: true context: ngtcp2 file: ngtcp2/Dockerfile-server - platforms: ${{ matrix.platform }} build-args: | MAKE_DEFINES=-j4 ${{ (inputs.build_main == 'true') && env.build-args || null }} tags: | - ghcr.io/${{ github.repository_owner }}/ngtcp2-server:${{ inputs.release_tag || 'latest' }} - openquantumsafe/ngtcp2-server:${{ inputs.release_tag || 'latest' }} + ghcr.io/${{ github.repository_owner }}/ngtcp2-server:${{ inputs.release_tag || 'latest' }}-${{ matrix.arch }} + openquantumsafe/ngtcp2-server:${{ inputs.release_tag || 'latest' }}-${{ matrix.arch }} - name: Push client Docker image to registries if: env.push == 'true' @@ -113,10 +110,23 @@ jobs: push: true context: ngtcp2 file: ngtcp2/Dockerfile-client - platforms: ${{ matrix.platform }} build-args: | MAKE_DEFINES=-j4 ${{ (inputs.build_main == 'true') && env.build-args || null }} tags: | - ghcr.io/${{ github.repository_owner }}/ngtcp2-client:${{ inputs.release_tag || 'latest' }} - openquantumsafe/ngtcp2-client:${{ inputs.release_tag || 'latest' }} + ghcr.io/${{ github.repository_owner }}/ngtcp2-client:${{ inputs.release_tag || 'latest' }}-${{ matrix.arch }} + openquantumsafe/ngtcp2-client:${{ 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: ngtcp2-server + release_tag: ${{ inputs.release_tag || 'latest' }} + - uses: ./.github/workflows/manifest + with: + image_name: ngtcp2-client + release_tag: ${{ inputs.release_tag || 'latest' }} diff --git a/.github/workflows/openssh.yml b/.github/workflows/openssh.yml index 206c81d..152d457 100644 --- a/.github/workflows/openssh.yml +++ b/.github/workflows/openssh.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: openssh - platforms: ${{ matrix.platform }} build-args: | MAKE_DEFINES=-j4 ${{ (inputs.build_main == 'true') && env.build-args || null }} @@ -81,10 +80,19 @@ jobs: with: push: true context: openssh - platforms: ${{ matrix.platform }} build-args: | MAKE_DEFINES=-j4 ${{ (inputs.build_main == 'true') && env.build-args || null }} tags: | - ghcr.io/${{ github.repository_owner }}/openssh:${{ inputs.release_tag || 'latest' }} - openquantumsafe/openssh:${{ inputs.release_tag || 'latest' }} + ghcr.io/${{ github.repository_owner }}/openssh:${{ inputs.release_tag || 'latest' }}-${{ matrix.arch }} + openquantumsafe/openssh:${{ 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: openssh + release_tag: ${{ inputs.release_tag || 'latest' }} diff --git a/.github/workflows/openssl3.yml b/.github/workflows/openssl3.yml index 5fa4d1b..a1ea2c0 100644 --- a/.github/workflows/openssl3.yml +++ b/.github/workflows/openssl3.yml @@ -42,10 +42,10 @@ jobs: fail-fast: false matrix: include: - - arch: arm64 - runner: oqs-arm64 - arch: x86_64 runner: ubuntu-latest + - arch: arm64 + runner: oqs-arm64 runs-on: ${{ matrix.runner }} steps: - uses: actions/checkout@v4 @@ -89,11 +89,11 @@ jobs: openquantumsafe/openssl3:${{ 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 - if: env.push == 'true' with: image_name: openssl3 release_tag: ${{ inputs.release_tag || 'latest' }} diff --git a/.github/workflows/openvpn.yml b/.github/workflows/openvpn.yml index 5941072..4b52e60 100644 --- a/.github/workflows/openvpn.yml +++ b/.github/workflows/openvpn.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: openvpn - platforms: ${{ matrix.platform }} build-args: | MAKE_DEFINES=-j4 ${{ (inputs.build_main == 'true') && env.build-args || null }} @@ -82,10 +81,19 @@ jobs: with: push: true context: openvpn - platforms: ${{ matrix.platform }} build-args: | MAKE_DEFINES=-j4 ${{ (inputs.build_main == 'true') && env.build-args || null }} tags: | - ghcr.io/${{ github.repository_owner }}/openvpn:${{ inputs.release_tag || 'latest' }} - openquantumsafe/openvpn:${{ inputs.release_tag || 'latest' }} + ghcr.io/${{ github.repository_owner }}/openvpn:${{ inputs.release_tag || 'latest' }}-${{ matrix.arch }} + openquantumsafe/openvpn:${{ 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: openvpn + release_tag: ${{ inputs.release_tag || 'latest' }} diff --git a/.github/workflows/wireshark.yml b/.github/workflows/wireshark.yml index 8b1724a..b8d2f49 100644 --- a/.github/workflows/wireshark.yml +++ b/.github/workflows/wireshark.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: wireshark - platforms: ${{ matrix.platform }} build-args: | ${{ (inputs.build_main == 'true') && env.build-args || null }} tags: oqs-wireshark @@ -76,9 +75,18 @@ jobs: with: push: true context: wireshark - platforms: ${{ matrix.platform }} build-args: | ${{ (inputs.build_main == 'true') && env.build-args || null }} tags: | - ghcr.io/${{ github.repository_owner }}/wireshark:${{ inputs.release_tag || 'latest' }} - openquantumsafe/wireshark:${{ inputs.release_tag || 'latest' }} + ghcr.io/${{ github.repository_owner }}/wireshark:${{ inputs.release_tag || 'latest' }}-${{ matrix.arch }} + openquantumsafe/wireshark:${{ 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: wireshark + release_tag: ${{ inputs.release_tag || 'latest' }}