diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 8394ac7..0f11e4c 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -12,63 +12,7 @@ env: REGISTRY_IMAGE: openquantumsafe/openssl3-multiplatformtest jobs: - build-arm64: - runs-on: oqs-arm64 - strategy: - fail-fast: false - matrix: - platform: -# - linux/amd64 -# - linux/arm/v6 -# - linux/arm/v7 - - linux/arm64 - steps: - - - name: Checkout - uses: actions/checkout@v3 - - - name: Docker meta - id: meta - uses: docker/metadata-action@v4 - with: - images: ${{ env.REGISTRY_IMAGE }} - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Login to Docker Hub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Build and push OpenSSL3+oqs-provider by digest - id: build - uses: docker/build-push-action@v4 - with: - context: openssl3 - platforms: ${{ matrix.platform }} - labels: ${{ steps.meta.outputs.labels }} - outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true - cache-from: type=gha - cache-to: type=gha,mode=max - - - name: Export digest - run: | - mkdir -p /tmp/digests - digest="${{ steps.build.outputs.digest }}" - touch "/tmp/digests/${digest#sha256:}" - - - name: Upload digest - uses: actions/upload-artifact@v3 - with: - name: digests - path: /tmp/digests/* - if-no-files-found: error - retention-days: 1 - - build-x64: - runs-on: ubuntu-latest + build: strategy: fail-fast: false matrix: @@ -76,7 +20,8 @@ jobs: - linux/amd64 # - linux/arm/v6 # - linux/arm/v7 -# - linux/arm64 + - oqs-arm64 + runs-on: ${{ matrix.platform }} steps: - name: Checkout @@ -121,12 +66,11 @@ jobs: path: /tmp/digests/* if-no-files-found: error retention-days: 1 - + merge: runs-on: ubuntu-latest needs: - - build-x64 - - build-arm64 + - build # for testing, just do it # if: github.ref == 'refs/heads/main' steps: