From 299ee3ae90cfb9370c2a0f5459a1d51f9fb44fe2 Mon Sep 17 00:00:00 2001 From: caesarw Date: Sun, 7 Apr 2024 14:31:48 +0000 Subject: [PATCH] Fix the wrong tags for the scheduled nightly build * simplified the checkout process * fixed the wrong tags for the scheduled builds (used to be `release`, now it should be `staging`) * upgraded the `checkout` action to v4.1.2 (no warnings anymore) --- .github/workflows/docker-publish.yml | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index c4556c520..9bb3a2cc5 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -24,32 +24,34 @@ jobs: runs-on: ubuntu-latest steps: - ## Workaround for GitHub repo names containing uppercase characters + # Workaround for GitHub repo names containing uppercase characters - name: Set lowercase repo name run: | - echo "IMAGE_NAME=${REPO,,}" >>${GITHUB_ENV} + echo "IMAGE_NAME=${REPO,,}" >> ${GITHUB_ENV} # Using the following workaround because currently GitHub Actions # does not support logical AND/OR operations on triggers # It's currently not possible to have `branches` under the `schedule` trigger - name: Checkout the release branch (on release) - if: ${{ github.event_name == 'release' }} - uses: actions/checkout@v3 - with: - ref: "release" - - - name: Checkout the release branch (on push) - if: ${{ github.event_name == 'push' }} - uses: actions/checkout@v3 + if: ${{ github.event_name == 'release' || github.event_name == 'push' }} + uses: actions/checkout@v4.1.2 with: ref: "release" - name: Checkout the staging branch if: ${{ github.event_name == 'schedule' }} - uses: actions/checkout@v3 + uses: actions/checkout@v4.1.2 with: ref: "staging" + # Get current branch name + # This is also part of the workaround for Actions not allowing logical + # AND/OR operators on triggers + # Otherwise the action triggered by schedule always has ref_name = release + - name: Get the current branch name + run: | + echo "BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)" >> ${GITHUB_ENV} + # Setting up QEMU for multi-arch image build - name: Set up QEMU uses: docker/setup-qemu-action@v3 @@ -62,7 +64,7 @@ jobs: id: metadata with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - tags: ${{ github.ref_name }} + tags: ${{ env.BRANCH_NAME }} # Login into package repository as the person who created the release - name: Log in to the Container registry