From 1402570ab3f280f30bceb4f06735dbd38ca80cfb Mon Sep 17 00:00:00 2001 From: Martin Tzvetanov Grigorov Date: Wed, 17 Jan 2024 10:08:00 +0200 Subject: [PATCH 01/13] Use environment variables to set the major and minor versions Use same versions as in the other Docker images: - major -> 3 - minor -> 0 Suggested-at: https://github.com/bioconda/bioconda-containers/pull/68#issuecomment-1893793704 Signed-off-by: Martin Tzvetanov Grigorov --- .github/workflows/build-env-image.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-env-image.yml b/.github/workflows/build-env-image.yml index 1bad2d18..3e50725d 100644 --- a/.github/workflows/build-env-image.yml +++ b/.github/workflows/build-env-image.yml @@ -11,11 +11,19 @@ on: push: branches: - 'main' + paths: + - 'images/build-env/**' + - '.github/workflows/build-env-image.yml' + jobs: build: name: Build image - ${{ matrix.image }} runs-on: ubuntu-22.04 + env: + MAJOR_VERSION: 3 + MINOR_VERSION: 0 + strategy: matrix: include: @@ -37,11 +45,6 @@ jobs: repository: 'bioconda/bioconda-utils' path: 'bioconda-utils' - - id: get-tag - run: | - tag=${{ github.event.release && github.event.release.tag_name || github.sha }} - printf %s "tag=${tag#v}" >> $GITHUB_OUTPUT - - name: Install qemu dependency if: ${{ matrix.arch == 'arm64' }} uses: docker/setup-qemu-action@v3 @@ -58,7 +61,8 @@ jobs: BASE_IMAGE=${{ matrix.base_image }} tags: >- latest - ${{ steps.get-tag.outputs.tag }} + ${{ env.MAJOR_VERSION }} + ${{ env.MAJOR_VERSION }}.${{ env.MINOR_VERSION }} dockerfiles: | ./images/build-env/Dockerfile From 949ac0d9ca1071f7cabe369a050dc0361589db81 Mon Sep 17 00:00:00 2001 From: Martin Tzvetanov Grigorov Date: Wed, 24 Jan 2024 09:44:14 +0200 Subject: [PATCH 02/13] Move the environment variables to be workflow level Install QEMU for all CPU architectures but amd64. At the moment this is just arm64 but now adding a new arch will not require changes to this step Signed-off-by: Martin Tzvetanov Grigorov --- .github/workflows/build-env-image.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-env-image.yml b/.github/workflows/build-env-image.yml index 3e50725d..35255aea 100644 --- a/.github/workflows/build-env-image.yml +++ b/.github/workflows/build-env-image.yml @@ -15,15 +15,14 @@ on: - 'images/build-env/**' - '.github/workflows/build-env-image.yml' - +env: + MAJOR_VERSION: 3 + MINOR_VERSION: 0 + jobs: build: name: Build image - ${{ matrix.image }} runs-on: ubuntu-22.04 - env: - MAJOR_VERSION: 3 - MINOR_VERSION: 0 - strategy: matrix: include: @@ -45,11 +44,11 @@ jobs: repository: 'bioconda/bioconda-utils' path: 'bioconda-utils' - - name: Install qemu dependency - if: ${{ matrix.arch == 'arm64' }} + - name: Install QEMU dependency + if: ${{ matrix.arch != 'amd64' }} uses: docker/setup-qemu-action@v3 with: - platforms: arm64 + platforms: ${{ matrix.arch }} - name: Build image id: buildah-build From 450d72e211cdbdd6f83344355c66fd69bff216f0 Mon Sep 17 00:00:00 2001 From: Martin Tzvetanov Grigorov Date: Wed, 24 Jan 2024 09:55:36 +0200 Subject: [PATCH 03/13] Build and push manifests for several tags Signed-off-by: Martin Tzvetanov Grigorov --- .github/workflows/build-env-image.yml | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-env-image.yml b/.github/workflows/build-env-image.yml index 35255aea..5c9389db 100644 --- a/.github/workflows/build-env-image.yml +++ b/.github/workflows/build-env-image.yml @@ -23,6 +23,8 @@ jobs: build: name: Build image - ${{ matrix.image }} runs-on: ubuntu-22.04 + outputs: + tags: ${{ steps.buildah-build.outputs.tags }} strategy: matrix: include: @@ -85,15 +87,15 @@ jobs: build-manifest: needs: [build] if: github.ref == 'refs/heads/main' && github.repository == 'bioconda/bioconda-containers' - name: quay.io/bioconda/${{ matrix.cfg.DOCKER_MANIFEST }}:${{ matrix.cfg.DOCKER_TAG }} - runs-on: ubuntu-latest + name: Build and push Docker manifest + runs-on: ubuntu-22.04 + env: + DOCKER_MANIFEST: bioconda-utils-build-env-cos7 + DOCKER_IMAGES: "quay.io/<>/bioconda-utils-build-env-cos7:<>,quay.io/<>/bioconda-utils-build-env-cos7-aarch64:<>" strategy: - fail-fast: false + fail-fast: true matrix: - cfg: - - DOCKER_MANIFEST: bioconda-utils-build-env-cos7 - DOCKER_TAG: "latest" - DOCKER_IMAGES: "quay.io/<>/bioconda-utils-build-env-cos7:<>,quay.io/<>/bioconda-utils-build-env-cos7-aarch64:<>" + tag: ${{ fromJson(needs.build.outputs.tags) }} steps: - uses: actions/checkout@v4 @@ -102,7 +104,7 @@ jobs: id: interpolate run: | set -x - INTERPOLATED=`echo "${{ matrix.cfg.DOCKER_IMAGES }}" | sed "s#<>#${{ secrets.QUAY_BIOCONDA_USERNAME }}#g" | sed "s#<>#${{ matrix.cfg.DOCKER_TAG }}#g"` + INTERPOLATED=`echo "${{ env.DOCKER_IMAGES }}" | sed "s#<>#${{ secrets.QUAY_BIOCONDA_USERNAME }}#g" | sed "s#<>#${{ matrix.tag }}#g"` echo "DOCKER_IMAGES=${INTERPOLATED}" >> "$GITHUB_OUTPUT" - name: Login to Quay.io registry @@ -115,6 +117,6 @@ jobs: - name: Push Docker manifest list for quay.io/bioconda uses: Noelware/docker-manifest-action@v0.3.0 with: - inputs: quay.io/${{ secrets.QUAY_BIOCONDA_USERNAME }}/${{ matrix.cfg.DOCKER_MANIFEST }}:${{ matrix.cfg.DOCKER_TAG }} + inputs: quay.io/${{ secrets.QUAY_BIOCONDA_USERNAME }}/${{ env.DOCKER_MANIFEST }}:${{ matrix.tag }} images: ${{ steps.interpolate.outputs.DOCKER_IMAGES }} push: true From 5bbfdff99e3befac6ec06c8b9eaccad54d346a38 Mon Sep 17 00:00:00 2001 From: Martin Tzvetanov Grigorov Date: Wed, 24 Jan 2024 10:08:57 +0200 Subject: [PATCH 04/13] Temporary enable pushing Signed-off-by: Martin Tzvetanov Grigorov --- .github/workflows/build-env-image.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-env-image.yml b/.github/workflows/build-env-image.yml index 5c9389db..e989db8d 100644 --- a/.github/workflows/build-env-image.yml +++ b/.github/workflows/build-env-image.yml @@ -75,7 +75,7 @@ jobs: done - name: Push To Quay - if: github.ref == 'refs/heads/main' && github.repository == 'bioconda/bioconda-containers' + # if: github.ref == 'refs/heads/main' && github.repository == 'bioconda/bioconda-containers' uses: redhat-actions/push-to-registry@v2 with: image: ${{ steps.buildah-build.outputs.image }} @@ -86,7 +86,7 @@ jobs: build-manifest: needs: [build] - if: github.ref == 'refs/heads/main' && github.repository == 'bioconda/bioconda-containers' + # if: github.ref == 'refs/heads/main' && github.repository == 'bioconda/bioconda-containers' name: Build and push Docker manifest runs-on: ubuntu-22.04 env: From 958672e5b107d1e1d3fd614c2d9a8ce33389ddd3 Mon Sep 17 00:00:00 2001 From: Martin Tzvetanov Grigorov Date: Wed, 24 Jan 2024 10:21:44 +0200 Subject: [PATCH 05/13] Use vars. context for the Quay.io username Signed-off-by: Martin Tzvetanov Grigorov --- .github/workflows/build-env-image.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-env-image.yml b/.github/workflows/build-env-image.yml index e989db8d..0901cfa5 100644 --- a/.github/workflows/build-env-image.yml +++ b/.github/workflows/build-env-image.yml @@ -29,10 +29,10 @@ jobs: matrix: include: - arch: arm64 - image: bioconda/bioconda-utils-build-env-cos7-aarch64 + image: ${{ vars.QUAY_BIOCONDA_USERNAME }}/bioconda-utils-build-env-cos7-aarch64 base_image: quay.io/condaforge/linux-anvil-aarch64 - arch: amd64 - image: bioconda/bioconda-utils-build-env-cos7-x86_64 + image: ${{ vars.QUAY_BIOCONDA_USERNAME }}/bioconda-utils-build-env-cos7-x86_64 base_image: quay.io/condaforge/linux-anvil-cos7-x86_64 steps: - name: Checkout bioconda-containers @@ -81,7 +81,7 @@ jobs: image: ${{ steps.buildah-build.outputs.image }} tags: ${{ steps.buildah-build.outputs.tags }} registry: ${{ secrets.QUAY_BIOCONDA_REPO }} - username: ${{ secrets.QUAY_BIOCONDA_USERNAME }} + username: ${{ vars.QUAY_BIOCONDA_USERNAME }} password: ${{ secrets.QUAY_BIOCONDA_TOKEN }} build-manifest: @@ -104,19 +104,19 @@ jobs: id: interpolate run: | set -x - INTERPOLATED=`echo "${{ env.DOCKER_IMAGES }}" | sed "s#<>#${{ secrets.QUAY_BIOCONDA_USERNAME }}#g" | sed "s#<>#${{ matrix.tag }}#g"` + INTERPOLATED=`echo "${{ env.DOCKER_IMAGES }}" | sed "s#<>#${{ vars.QUAY_BIOCONDA_USERNAME }}#g" | sed "s#<>#${{ matrix.tag }}#g"` echo "DOCKER_IMAGES=${INTERPOLATED}" >> "$GITHUB_OUTPUT" - name: Login to Quay.io registry uses: docker/login-action@v2 with: registry: ${{ secrets.QUAY_BIOCONDA_REPO }} - username: ${{ secrets.QUAY_BIOCONDA_USERNAME }} + username: ${{ vars.QUAY_BIOCONDA_USERNAME }} password: ${{ secrets.QUAY_BIOCONDA_TOKEN }} - name: Push Docker manifest list for quay.io/bioconda uses: Noelware/docker-manifest-action@v0.3.0 with: - inputs: quay.io/${{ secrets.QUAY_BIOCONDA_USERNAME }}/${{ env.DOCKER_MANIFEST }}:${{ matrix.tag }} + inputs: quay.io/${{ vars.QUAY_BIOCONDA_USERNAME }}/${{ env.DOCKER_MANIFEST }}:${{ matrix.tag }} images: ${{ steps.interpolate.outputs.DOCKER_IMAGES }} push: true From ea80a8eaca0475cda6fcdf72744b854167a3fd17 Mon Sep 17 00:00:00 2001 From: Martin Tzvetanov Grigorov Date: Wed, 24 Jan 2024 10:42:36 +0200 Subject: [PATCH 06/13] Convert Bash array 'tags' to JSON array Signed-off-by: Martin Tzvetanov Grigorov --- .github/workflows/build-env-image.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-env-image.yml b/.github/workflows/build-env-image.yml index 0901cfa5..2b9abfbd 100644 --- a/.github/workflows/build-env-image.yml +++ b/.github/workflows/build-env-image.yml @@ -24,7 +24,7 @@ jobs: name: Build image - ${{ matrix.image }} runs-on: ubuntu-22.04 outputs: - tags: ${{ steps.buildah-build.outputs.tags }} + tags: ${{ steps.test.outputs.tags }} strategy: matrix: include: @@ -68,14 +68,18 @@ jobs: ./images/build-env/Dockerfile - name: Test built image + id: test run: | image='${{ steps.buildah-build.outputs.image }}' for tag in ${{ steps.buildah-build.outputs.tags }} ; do podman run --rm "${image}:${tag}" bioconda-utils --version done + tags_json=$(jq --compact-output --null-input '$ARGS.positional' --args -- "${{ steps.buildah-build.outputs.tags }}") + echo $tags_json + echo "tags=${tags_json}" >> $GITHUB_OUTPUT - name: Push To Quay - # if: github.ref == 'refs/heads/main' && github.repository == 'bioconda/bioconda-containers' + if: github.ref == 'refs/heads/main' && github.repository == 'bioconda/bioconda-containers' uses: redhat-actions/push-to-registry@v2 with: image: ${{ steps.buildah-build.outputs.image }} From c1751f93f33a26d6dea7c5be0a1f80b9ec076864 Mon Sep 17 00:00:00 2001 From: Martin Tzvetanov Grigorov Date: Wed, 24 Jan 2024 10:51:58 +0200 Subject: [PATCH 07/13] Debug bash array to json array Signed-off-by: Martin Tzvetanov Grigorov --- .github/workflows/build-env-image.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-env-image.yml b/.github/workflows/build-env-image.yml index 2b9abfbd..5e927c7d 100644 --- a/.github/workflows/build-env-image.yml +++ b/.github/workflows/build-env-image.yml @@ -70,13 +70,14 @@ jobs: - name: Test built image id: test run: | + echo "${{ steps.buildah-build.outputs.tags }}" image='${{ steps.buildah-build.outputs.image }}' for tag in ${{ steps.buildah-build.outputs.tags }} ; do podman run --rm "${image}:${tag}" bioconda-utils --version done tags_json=$(jq --compact-output --null-input '$ARGS.positional' --args -- "${{ steps.buildah-build.outputs.tags }}") echo $tags_json - echo "tags=${tags_json}" >> $GITHUB_OUTPUT + echo "tags='${tags_json}'" >> $GITHUB_OUTPUT - name: Push To Quay if: github.ref == 'refs/heads/main' && github.repository == 'bioconda/bioconda-containers' From 13dabbe62b26fb4daaeafbb74bfd0cc65de88ea8 Mon Sep 17 00:00:00 2001 From: Martin Tzvetanov Grigorov Date: Wed, 24 Jan 2024 11:03:55 +0200 Subject: [PATCH 08/13] More debug Signed-off-by: Martin Tzvetanov Grigorov --- .github/workflows/build-env-image.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-env-image.yml b/.github/workflows/build-env-image.yml index 5e927c7d..7f3dbbaf 100644 --- a/.github/workflows/build-env-image.yml +++ b/.github/workflows/build-env-image.yml @@ -70,6 +70,7 @@ jobs: - name: Test built image id: test run: | + jq --version echo "${{ steps.buildah-build.outputs.tags }}" image='${{ steps.buildah-build.outputs.image }}' for tag in ${{ steps.buildah-build.outputs.tags }} ; do @@ -77,7 +78,7 @@ jobs: done tags_json=$(jq --compact-output --null-input '$ARGS.positional' --args -- "${{ steps.buildah-build.outputs.tags }}") echo $tags_json - echo "tags='${tags_json}'" >> $GITHUB_OUTPUT + echo "tags=${tags_json}" >> $GITHUB_OUTPUT - name: Push To Quay if: github.ref == 'refs/heads/main' && github.repository == 'bioconda/bioconda-containers' From 4e4cf3721711ed75438d0e78a2617c39ee99ee65 Mon Sep 17 00:00:00 2001 From: Martin Tzvetanov Grigorov Date: Wed, 24 Jan 2024 11:14:32 +0200 Subject: [PATCH 09/13] Convert Bash string to JSON array. Split by whitespace Signed-off-by: Martin Tzvetanov Grigorov --- .github/workflows/build-env-image.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build-env-image.yml b/.github/workflows/build-env-image.yml index 7f3dbbaf..c1008cd8 100644 --- a/.github/workflows/build-env-image.yml +++ b/.github/workflows/build-env-image.yml @@ -70,13 +70,11 @@ jobs: - name: Test built image id: test run: | - jq --version - echo "${{ steps.buildah-build.outputs.tags }}" image='${{ steps.buildah-build.outputs.image }}' for tag in ${{ steps.buildah-build.outputs.tags }} ; do podman run --rm "${image}:${tag}" bioconda-utils --version done - tags_json=$(jq --compact-output --null-input '$ARGS.positional' --args -- "${{ steps.buildah-build.outputs.tags }}") + tags_json=$(echo -n "${{ steps.buildah-build.outputs.tags }}" | jq --compact-output --raw-input --slurp 'split(" ")') echo $tags_json echo "tags=${tags_json}" >> $GITHUB_OUTPUT From 17d313e1d90a50b1243287e33cfa331ffaf20c97 Mon Sep 17 00:00:00 2001 From: Martin Tzvetanov Grigorov Date: Wed, 24 Jan 2024 11:39:23 +0200 Subject: [PATCH 10/13] Use `docker manifest` cli instead of Noelware/docker-manifest-action Signed-off-by: Martin Tzvetanov Grigorov --- .github/workflows/build-env-image.yml | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-env-image.yml b/.github/workflows/build-env-image.yml index c1008cd8..a545f687 100644 --- a/.github/workflows/build-env-image.yml +++ b/.github/workflows/build-env-image.yml @@ -119,8 +119,17 @@ jobs: password: ${{ secrets.QUAY_BIOCONDA_TOKEN }} - name: Push Docker manifest list for quay.io/bioconda - uses: Noelware/docker-manifest-action@v0.3.0 - with: - inputs: quay.io/${{ vars.QUAY_BIOCONDA_USERNAME }}/${{ env.DOCKER_MANIFEST }}:${{ matrix.tag }} - images: ${{ steps.interpolate.outputs.DOCKER_IMAGES }} - push: true + run: | + PREFIX=${{ secrets.QUAY_BIOCONDA_REPO }}/${{ vars.QUAY_BIOCONDA_USERNAME }} + docker manifest create ${PREFIX}/${{ env.DOCKER_MANIFEST }}:${{ matrix.tag }} \ + --amend ${PREFIX}/bioconda-utils-build-env-cos7-x86_64:${{ matrix.tag }} \ + --amend ${PREFIX}/bioconda-utils-build-env-cos7-aarch64:${{ matrix.tag }} + + docker manifest inspect ${PREFIX}/${{ env.DOCKER_MANIFEST }}:${{ matrix.tag }} + + docker manifest push ${PREFIX}/${{ env.DOCKER_MANIFEST }}:${{ matrix.tag }} + # uses: Noelware/docker-manifest-action@v0.3.0 + # with: + # inputs: quay.io/${{ vars.QUAY_BIOCONDA_USERNAME }}/${{ env.DOCKER_MANIFEST }}:${{ matrix.tag }} + # images: ${{ steps.interpolate.outputs.DOCKER_IMAGES }} + # push: true From 165af24f6ce5112ce871c0ba6c493e36ffc044bd Mon Sep 17 00:00:00 2001 From: Martin Tzvetanov Grigorov Date: Wed, 24 Jan 2024 11:54:20 +0200 Subject: [PATCH 11/13] Go back to `secrets.QUAY_BIOCONDA_USERNAME` Remove debug statements and commented out code Signed-off-by: Martin Tzvetanov Grigorov --- .github/workflows/build-env-image.yml | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-env-image.yml b/.github/workflows/build-env-image.yml index a545f687..ffde2d61 100644 --- a/.github/workflows/build-env-image.yml +++ b/.github/workflows/build-env-image.yml @@ -29,10 +29,10 @@ jobs: matrix: include: - arch: arm64 - image: ${{ vars.QUAY_BIOCONDA_USERNAME }}/bioconda-utils-build-env-cos7-aarch64 + image: bioconda/bioconda-utils-build-env-cos7-aarch64 base_image: quay.io/condaforge/linux-anvil-aarch64 - arch: amd64 - image: ${{ vars.QUAY_BIOCONDA_USERNAME }}/bioconda-utils-build-env-cos7-x86_64 + image: bioconda/bioconda-utils-build-env-cos7-x86_64 base_image: quay.io/condaforge/linux-anvil-cos7-x86_64 steps: - name: Checkout bioconda-containers @@ -75,7 +75,6 @@ jobs: podman run --rm "${image}:${tag}" bioconda-utils --version done tags_json=$(echo -n "${{ steps.buildah-build.outputs.tags }}" | jq --compact-output --raw-input --slurp 'split(" ")') - echo $tags_json echo "tags=${tags_json}" >> $GITHUB_OUTPUT - name: Push To Quay @@ -85,7 +84,7 @@ jobs: image: ${{ steps.buildah-build.outputs.image }} tags: ${{ steps.buildah-build.outputs.tags }} registry: ${{ secrets.QUAY_BIOCONDA_REPO }} - username: ${{ vars.QUAY_BIOCONDA_USERNAME }} + username: ${{ secrets.QUAY_BIOCONDA_USERNAME }} password: ${{ secrets.QUAY_BIOCONDA_TOKEN }} build-manifest: @@ -108,19 +107,19 @@ jobs: id: interpolate run: | set -x - INTERPOLATED=`echo "${{ env.DOCKER_IMAGES }}" | sed "s#<>#${{ vars.QUAY_BIOCONDA_USERNAME }}#g" | sed "s#<>#${{ matrix.tag }}#g"` + INTERPOLATED=`echo "${{ env.DOCKER_IMAGES }}" | sed "s#<>#${{ secrets.QUAY_BIOCONDA_USERNAME }}#g" | sed "s#<>#${{ matrix.tag }}#g"` echo "DOCKER_IMAGES=${INTERPOLATED}" >> "$GITHUB_OUTPUT" - name: Login to Quay.io registry uses: docker/login-action@v2 with: registry: ${{ secrets.QUAY_BIOCONDA_REPO }} - username: ${{ vars.QUAY_BIOCONDA_USERNAME }} + username: ${{ secrets.QUAY_BIOCONDA_USERNAME }} password: ${{ secrets.QUAY_BIOCONDA_TOKEN }} - name: Push Docker manifest list for quay.io/bioconda run: | - PREFIX=${{ secrets.QUAY_BIOCONDA_REPO }}/${{ vars.QUAY_BIOCONDA_USERNAME }} + PREFIX=${{ secrets.QUAY_BIOCONDA_REPO }}/${{ secrets.QUAY_BIOCONDA_USERNAME }} docker manifest create ${PREFIX}/${{ env.DOCKER_MANIFEST }}:${{ matrix.tag }} \ --amend ${PREFIX}/bioconda-utils-build-env-cos7-x86_64:${{ matrix.tag }} \ --amend ${PREFIX}/bioconda-utils-build-env-cos7-aarch64:${{ matrix.tag }} @@ -128,8 +127,3 @@ jobs: docker manifest inspect ${PREFIX}/${{ env.DOCKER_MANIFEST }}:${{ matrix.tag }} docker manifest push ${PREFIX}/${{ env.DOCKER_MANIFEST }}:${{ matrix.tag }} - # uses: Noelware/docker-manifest-action@v0.3.0 - # with: - # inputs: quay.io/${{ vars.QUAY_BIOCONDA_USERNAME }}/${{ env.DOCKER_MANIFEST }}:${{ matrix.tag }} - # images: ${{ steps.interpolate.outputs.DOCKER_IMAGES }} - # push: true From aab49c019f4abc68a0ed8ffd2d4914a985b1afbf Mon Sep 17 00:00:00 2001 From: Martin Tzvetanov Grigorov Date: Wed, 24 Jan 2024 13:29:15 +0200 Subject: [PATCH 12/13] Re-enable the check for push to main before pushing the manifest Signed-off-by: Martin Tzvetanov Grigorov --- .github/workflows/build-env-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-env-image.yml b/.github/workflows/build-env-image.yml index ffde2d61..cd15f8f8 100644 --- a/.github/workflows/build-env-image.yml +++ b/.github/workflows/build-env-image.yml @@ -89,7 +89,7 @@ jobs: build-manifest: needs: [build] - # if: github.ref == 'refs/heads/main' && github.repository == 'bioconda/bioconda-containers' + if: github.ref == 'refs/heads/main' && github.repository == 'bioconda/bioconda-containers' name: Build and push Docker manifest runs-on: ubuntu-22.04 env: From b22154620699e5766a6f71f860294c11b945582e Mon Sep 17 00:00:00 2001 From: Ryan Dale Date: Sat, 27 Jan 2024 15:58:12 -0500 Subject: [PATCH 13/13] convert to testing targets --- .github/workflows/build-env-image.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-env-image.yml b/.github/workflows/build-env-image.yml index cd15f8f8..c4089949 100644 --- a/.github/workflows/build-env-image.yml +++ b/.github/workflows/build-env-image.yml @@ -10,7 +10,7 @@ on: - '.github/workflows/build-env-image.yml' push: branches: - - 'main' + - 'test-push' paths: - 'images/build-env/**' - '.github/workflows/build-env-image.yml' @@ -29,10 +29,10 @@ jobs: matrix: include: - arch: arm64 - image: bioconda/bioconda-utils-build-env-cos7-aarch64 + image: bioconda/tmp-bioconda-utils-build-env-cos7-aarch64 base_image: quay.io/condaforge/linux-anvil-aarch64 - arch: amd64 - image: bioconda/bioconda-utils-build-env-cos7-x86_64 + image: bioconda/tmp-bioconda-utils-build-env-cos7-x86_64 base_image: quay.io/condaforge/linux-anvil-cos7-x86_64 steps: - name: Checkout bioconda-containers @@ -78,7 +78,7 @@ jobs: echo "tags=${tags_json}" >> $GITHUB_OUTPUT - name: Push To Quay - if: github.ref == 'refs/heads/main' && github.repository == 'bioconda/bioconda-containers' + if: github.ref == 'refs/heads/test-push' && github.repository == 'bioconda/bioconda-containers' uses: redhat-actions/push-to-registry@v2 with: image: ${{ steps.buildah-build.outputs.image }}