From dfb92483e6bb130072cb43ef5bc3480308684bbc Mon Sep 17 00:00:00 2001 From: Alex Bozarth Date: Wed, 18 Dec 2024 05:04:59 -0600 Subject: [PATCH] Address issues with the push manifest CI workflow (#333) Contrary to my prior understanding, local workflows can not be called in the uses of a step, only in the uses of a job. I have update all the workflows to use the push-manifest.yml workflow at the job level instead of step. Signed-off-by: Alex Bozarth --- .github/workflows/curl.yml | 34 +++++++++++++++++++-------------- .github/workflows/h2load.yml | 10 ++++------ .github/workflows/haproxy.yml | 10 ++++------ .github/workflows/httpd.yml | 10 ++++------ .github/workflows/locust.yml | 10 ++++------ .github/workflows/mosquitto.yml | 10 ++++------ .github/workflows/nginx.yml | 10 ++++------ .github/workflows/ngtcp2.yml | 24 ++++++++++++----------- .github/workflows/openssh.yml | 10 ++++------ .github/workflows/openssl3.yml | 10 ++++------ .github/workflows/openvpn.yml | 10 ++++------ .github/workflows/wireshark.yml | 10 ++++------ 12 files changed, 73 insertions(+), 85 deletions(-) diff --git a/.github/workflows/curl.yml b/.github/workflows/curl.yml index bd6db8e..290730b 100644 --- a/.github/workflows/curl.yml +++ b/.github/workflows/curl.yml @@ -138,20 +138,26 @@ jobs: ghcr.io/${{ github.repository_owner }}/curl:${{ inputs.release_tag || 'latest' }}-${{ matrix.arch }} openquantumsafe/curl:${{ inputs.release_tag || 'latest' }}-${{ matrix.arch }} + push-optimized: + if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' && inputs.build_main != 'true' }} + needs: build + uses: ./.github/workflows/push-manifest.yml + with: + image_name: curl + release_tag: optimized + + push-dev: + if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' && inputs.build_main != 'true' }} + needs: build + uses: ./.github/workflows/push-manifest.yml + with: + image_name: curl-dev + release_tag: latest + push: if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' && inputs.build_main != 'true' }} needs: build - runs-on: ubuntu-latest - steps: - - uses: ./.github/workflows/manifest.yml - with: - image_name: curl - release_tag: optimized - - uses: ./.github/workflows/manifest.yml - with: - image_name: curl-dev - release_tag: latest - - uses: ./.github/workflows/manifest.yml - with: - image_name: curl - release_tag: ${{ inputs.release_tag || 'latest' }} + uses: ./.github/workflows/push-manifest.yml + with: + image_name: curl + release_tag: ${{ inputs.release_tag || 'latest' }} diff --git a/.github/workflows/h2load.yml b/.github/workflows/h2load.yml index c9c30a4..ffa2065 100644 --- a/.github/workflows/h2load.yml +++ b/.github/workflows/h2load.yml @@ -100,9 +100,7 @@ jobs: push: if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' && inputs.build_main != 'true' }} needs: build - runs-on: ubuntu-latest - steps: - - uses: ./.github/workflows/manifest.yml - with: - image_name: h2load - release_tag: ${{ inputs.release_tag || 'latest' }} + uses: ./.github/workflows/push-manifest.yml + with: + image_name: h2load + release_tag: ${{ inputs.release_tag || 'latest' }} diff --git a/.github/workflows/haproxy.yml b/.github/workflows/haproxy.yml index c02342d..e9e1dd0 100644 --- a/.github/workflows/haproxy.yml +++ b/.github/workflows/haproxy.yml @@ -103,9 +103,7 @@ jobs: push: if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' && inputs.build_main != 'true' }} needs: build - runs-on: ubuntu-latest - steps: - - uses: ./.github/workflows/manifest.yml - with: - image_name: haproxy - release_tag: ${{ inputs.release_tag || 'latest' }} + uses: ./.github/workflows/push-manifest.yml + with: + image_name: haproxy + release_tag: ${{ inputs.release_tag || 'latest' }} diff --git a/.github/workflows/httpd.yml b/.github/workflows/httpd.yml index 1ce7e68..5794105 100644 --- a/.github/workflows/httpd.yml +++ b/.github/workflows/httpd.yml @@ -103,9 +103,7 @@ jobs: push: if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' && inputs.build_main != 'true' }} needs: build - runs-on: ubuntu-latest - steps: - - uses: ./.github/workflows/manifest.yml - with: - image_name: httpd - release_tag: ${{ inputs.release_tag || 'latest' }} + uses: ./.github/workflows/push-manifest.yml + with: + image_name: httpd + release_tag: ${{ inputs.release_tag || 'latest' }} diff --git a/.github/workflows/locust.yml b/.github/workflows/locust.yml index dbbd328..c98907f 100644 --- a/.github/workflows/locust.yml +++ b/.github/workflows/locust.yml @@ -127,9 +127,7 @@ jobs: push: if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' && inputs.build_main != 'true' }} needs: build - runs-on: ubuntu-latest - steps: - - uses: ./.github/workflows/manifest.yml - with: - image_name: locust - release_tag: ${{ inputs.release_tag || 'latest' }} + uses: ./.github/workflows/push-manifest.yml + with: + image_name: locust + release_tag: ${{ inputs.release_tag || 'latest' }} diff --git a/.github/workflows/mosquitto.yml b/.github/workflows/mosquitto.yml index 4910693..d0dfb7d 100644 --- a/.github/workflows/mosquitto.yml +++ b/.github/workflows/mosquitto.yml @@ -94,9 +94,7 @@ jobs: push: if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' && inputs.build_main != 'true' }} needs: build - runs-on: ubuntu-latest - steps: - - uses: ./.github/workflows/manifest.yml - with: - image_name: mosquitto - release_tag: ${{ inputs.release_tag || 'latest' }} + uses: ./.github/workflows/push-manifest.yml + with: + image_name: mosquitto + release_tag: ${{ inputs.release_tag || 'latest' }} diff --git a/.github/workflows/nginx.yml b/.github/workflows/nginx.yml index 73d9233..dab9ced 100644 --- a/.github/workflows/nginx.yml +++ b/.github/workflows/nginx.yml @@ -104,9 +104,7 @@ jobs: push: if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' && inputs.build_main != 'true' }} needs: build - runs-on: ubuntu-latest - steps: - - uses: ./.github/workflows/manifest.yml - with: - image_name: nginx - release_tag: ${{ inputs.release_tag || 'latest' }} + uses: ./.github/workflows/push-manifest.yml + with: + image_name: nginx + release_tag: ${{ inputs.release_tag || 'latest' }} diff --git a/.github/workflows/ngtcp2.yml b/.github/workflows/ngtcp2.yml index 440b622..e1504f9 100644 --- a/.github/workflows/ngtcp2.yml +++ b/.github/workflows/ngtcp2.yml @@ -117,16 +117,18 @@ jobs: ghcr.io/${{ github.repository_owner }}/ngtcp2-client:${{ inputs.release_tag || 'latest' }}-${{ matrix.arch }} openquantumsafe/ngtcp2-client:${{ inputs.release_tag || 'latest' }}-${{ matrix.arch }} - push: + push-server: if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' && inputs.build_main != 'true' }} needs: build - runs-on: ubuntu-latest - steps: - - uses: ./.github/workflows/manifest.yml - with: - image_name: ngtcp2-server - release_tag: ${{ inputs.release_tag || 'latest' }} - - uses: ./.github/workflows/manifest.yml - with: - image_name: ngtcp2-client - release_tag: ${{ inputs.release_tag || 'latest' }} + uses: ./.github/workflows/push-manifest.yml + with: + image_name: ngtcp2-server + release_tag: ${{ inputs.release_tag || 'latest' }} + + push-client: + if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' && inputs.build_main != 'true' }} + needs: build + uses: ./.github/workflows/push-manifest.yml + with: + image_name: ngtcp2-client + release_tag: ${{ inputs.release_tag || 'latest' }} \ No newline at end of file diff --git a/.github/workflows/openssh.yml b/.github/workflows/openssh.yml index cb3e7e1..b28d608 100644 --- a/.github/workflows/openssh.yml +++ b/.github/workflows/openssh.yml @@ -90,9 +90,7 @@ jobs: push: if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' && inputs.build_main != 'true' }} needs: build - runs-on: ubuntu-latest - steps: - - uses: ./.github/workflows/manifest.yml - with: - image_name: openssh - release_tag: ${{ inputs.release_tag || 'latest' }} + uses: ./.github/workflows/push-manifest.yml + with: + image_name: openssh + release_tag: ${{ inputs.release_tag || 'latest' }} diff --git a/.github/workflows/openssl3.yml b/.github/workflows/openssl3.yml index 27a1550..79487c1 100644 --- a/.github/workflows/openssl3.yml +++ b/.github/workflows/openssl3.yml @@ -91,9 +91,7 @@ jobs: push: if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' && inputs.build_main != 'true' }} needs: build - runs-on: ubuntu-latest - steps: - - uses: ./.github/workflows/manifest.yml - with: - image_name: openssl3 - release_tag: ${{ inputs.release_tag || 'latest' }} + uses: ./.github/workflows/push-manifest.yml + with: + image_name: openssl3 + release_tag: ${{ inputs.release_tag || 'latest' }} diff --git a/.github/workflows/openvpn.yml b/.github/workflows/openvpn.yml index 234a56b..02d6c64 100644 --- a/.github/workflows/openvpn.yml +++ b/.github/workflows/openvpn.yml @@ -91,9 +91,7 @@ jobs: push: if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' && inputs.build_main != 'true' }} needs: build - runs-on: ubuntu-latest - steps: - - uses: ./.github/workflows/manifest.yml - with: - image_name: openvpn - release_tag: ${{ inputs.release_tag || 'latest' }} + uses: ./.github/workflows/push-manifest.yml + with: + image_name: openvpn + release_tag: ${{ inputs.release_tag || 'latest' }} diff --git a/.github/workflows/wireshark.yml b/.github/workflows/wireshark.yml index 024dd9c..ad3c6db 100644 --- a/.github/workflows/wireshark.yml +++ b/.github/workflows/wireshark.yml @@ -84,9 +84,7 @@ jobs: push: if: ${{ github.repository == 'open-quantum-safe/oqs-demos' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' && inputs.build_main != 'true' }} needs: build - runs-on: ubuntu-latest - steps: - - uses: ./.github/workflows/manifest.yml - with: - image_name: wireshark - release_tag: ${{ inputs.release_tag || 'latest' }} + uses: ./.github/workflows/push-manifest.yml + with: + image_name: wireshark + release_tag: ${{ inputs.release_tag || 'latest' }}