From b0a6b8355fcc89107515b0c3c52e1998f26dcbcf Mon Sep 17 00:00:00 2001 From: Alex Bozarth Date: Tue, 17 Dec 2024 11:58:50 -0600 Subject: [PATCH] test push mainifest Signed-off-by: Alex Bozarth --- .github/workflows/openssl3.yml | 12 ++++++------ .github/workflows/push-manifest.yml | 23 +++++++++++------------ 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/.github/workflows/openssl3.yml b/.github/workflows/openssl3.yml index 27a1550..efa1030 100644 --- 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' ] @@ -44,8 +44,8 @@ jobs: include: - arch: x86_64 runner: ubuntu-latest - - arch: arm64 - runner: oqs-arm64 + # - arch: arm64 + # runner: oqs-arm64 runs-on: ${{ matrix.runner }} steps: - uses: actions/checkout@v4 @@ -76,7 +76,7 @@ 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 @@ -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' && inputs.build_main != 'true' }} + # 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 + - uses: ./.github/workflows/push-manifest.yml with: image_name: openssl3 release_tag: ${{ inputs.release_tag || 'latest' }} diff --git a/.github/workflows/push-manifest.yml b/.github/workflows/push-manifest.yml index a1a12d5..7abaa32 100644 --- a/.github/workflows/push-manifest.yml +++ b/.github/workflows/push-manifest.yml @@ -16,10 +16,10 @@ jobs: push: runs-on: ubuntu-latest steps: - - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} + # - uses: docker/login-action@v3 + # with: + # username: ${{ secrets.DOCKERHUB_USERNAME }} + # password: ${{ secrets.DOCKERHUB_TOKEN }} - uses: docker/login-action@v3 with: registry: ghcr.io @@ -29,13 +29,12 @@ jobs: - name: Push multiarch image to ghcr.io run: | docker manifest create ghcr.io/${{ github.repository_owner }}/${{ inputs.image_name }}:${{ inputs.release_tag || 'latest' }} \ - --amend ghcr.io/${{ github.repository_owner }}/${{ inputs.image_name }}:${{ inputs.release_tag || 'latest' }}-x86_64 \ - --amend ghcr.io/${{ github.repository_owner }}/${{ inputs.image_name }}:${{ inputs.release_tag || 'latest' }}-arm64 && + --amend ghcr.io/${{ github.repository_owner }}/${{ inputs.image_name }}:${{ inputs.release_tag || 'latest' }}-x86_64 docker manifest push ghcr.io/${{ github.repository_owner }}/${{ inputs.image_name }}:${{ inputs.release_tag || 'latest' }} - - name: Push multiarch image to DockerHub - run: | - docker manifest create openquantumsafe/${{ inputs.image_name }}:${{ inputs.release_tag || 'latest' }} \ - --amend openquantumsafe/${{ inputs.image_name }}:${{ inputs.release_tag || 'latest' }}-x86_64 \ - --amend openquantumsafe/${{ inputs.image_name }}:${{ inputs.release_tag || 'latest' }}-arm64 && - docker manifest push openquantumsafe/${{ inputs.image_name }}:${{ inputs.release_tag || 'latest' }} + # - name: Push multiarch image to DockerHub + # run: | + # docker manifest create openquantumsafe/${{ inputs.image_name }}:${{ inputs.release_tag || 'latest' }} \ + # --amend openquantumsafe/${{ inputs.image_name }}:${{ inputs.release_tag || 'latest' }}-x86_64 \ + # --amend openquantumsafe/${{ inputs.image_name }}:${{ inputs.release_tag || 'latest' }}-arm64 && + # docker manifest push openquantumsafe/${{ inputs.image_name }}:${{ inputs.release_tag || 'latest' }}