Skip to content

Commit

Permalink
Address issues with the push manifest CI workflow
Browse files Browse the repository at this point in the history
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 <ajbozart@us.ibm.com>
  • Loading branch information
ajbozarth committed Dec 17, 2024
1 parent fff9e87 commit 82ba875
Show file tree
Hide file tree
Showing 12 changed files with 73 additions and 85 deletions.
34 changes: 20 additions & 14 deletions .github/workflows/curl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}
10 changes: 4 additions & 6 deletions .github/workflows/h2load.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}
10 changes: 4 additions & 6 deletions .github/workflows/haproxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}
10 changes: 4 additions & 6 deletions .github/workflows/httpd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}
10 changes: 4 additions & 6 deletions .github/workflows/locust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}
10 changes: 4 additions & 6 deletions .github/workflows/mosquitto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}
10 changes: 4 additions & 6 deletions .github/workflows/nginx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}
24 changes: 13 additions & 11 deletions .github/workflows/ngtcp2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}
10 changes: 4 additions & 6 deletions .github/workflows/openssh.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}
10 changes: 4 additions & 6 deletions .github/workflows/openssl3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}
10 changes: 4 additions & 6 deletions .github/workflows/openvpn.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}
10 changes: 4 additions & 6 deletions .github/workflows/wireshark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}

0 comments on commit 82ba875

Please sign in to comment.