From: Luca Heltai Date: Tue, 25 Jun 2024 13:41:21 +0000 (+0200) Subject: Try to build on different runners. X-Git-Tag: v9.6.0-rc1~158^2~1 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=031c1a6cdd5b1cfdc0202f214c468903048c43d8;p=dealii.git Try to build on different runners. --- diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 5f932174e7..e3e676eea3 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -22,12 +22,24 @@ jobs: fail-fast: false matrix: ubuntu_version: [focal, jammy] + platform: [linux/arm64, linux/amd64] # Use only 1 job to build, as more jobs # would starve the github machine for memory. include: - n_jobs: 1 steps: + - name: Prepare + run: | + platform=${{ matrix.platform }} + echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV + + - name: Docker meta + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ env.REGISTRY_IMAGE }} + - name: Checkout code uses: actions/checkout@v4 @@ -37,7 +49,7 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - - name: Login to DockerHub + - name: Login to Docker Hub uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_USERNAME }} @@ -50,7 +62,7 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Build and push Docker image of master ${{ matrix.ubuntu_version }} + - name: Build and push Docker image of master ${{ matrix.ubuntu_version }}-${{ matrix.platform }} uses: docker/build-push-action@v6 with: context: ./contrib/docker/ @@ -60,8 +72,68 @@ jobs: IMG=${{ matrix.ubuntu_version }} NJOBS=${{ matrix.n_jobs }} VER=master - platforms: linux/arm64,linux/amd64 + platforms: ${{ matrix.platform }} + labels: ${{ steps.meta.outputs.labels }} push: ${{ github.event_name == 'schedule' }} tags: | dealii/dealii:master-${{ matrix.ubuntu_version }} ghcr.io/${{ github.repository }}:master-${{ matrix.ubuntu_version }} + outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true + + - 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@v4 + with: + name: digests-${{ env.PLATFORM_PAIR }} + path: /tmp/digests/* + if-no-files-found: error + retention-days: 1 + merge: + runs-on: ubuntu-latest + needs: + - build-master-docker + + steps: + - name: Download digests + uses: actions/download-artifact@v4 + with: + path: /tmp/digests + pattern: digests-* + merge-multiple: true + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Docker meta + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ env.REGISTRY_IMAGE }} + + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Log in to the Container registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Create manifest list and push + working-directory: /tmp/digests + run: | + docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ + $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *) + + - name: Inspect image + run: | + docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }} \ No newline at end of file