From 8562cb5d9b68b331eabee9ca52050236f4683ba6 Mon Sep 17 00:00:00 2001 From: mgoerens Date: Wed, 26 Jul 2023 14:38:58 +0200 Subject: [PATCH] Fix default branch name in workflows Signed-off-by: mgoerens --- .github/workflows/build.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b0059194..4c189fb0 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -203,13 +203,13 @@ jobs: MERGE_METHOD: squash MERGE_LABELS: "" - - name: Get master branch sha - id: master_sha + - name: Get main branch sha + id: main_sha if: ${{ steps.check_version_updated.outputs.updated == 'true'}} run: | git fetch - export ORIGIN_MASTER_SHA=$(git rev-parse origin/master) - echo "origin_master_sha=$ORIGIN_MASTER_SHA" | tee -a $GITHUB_OUTPUT + export ORIGIN_MAIN_SHA=$(git rev-parse origin/main) + echo "origin_main_sha=$ORIGIN_MAIN_SHA" | tee -a $GITHUB_OUTPUT - name: Create release tag id: create_release_tag @@ -224,7 +224,7 @@ jobs: github_token: ${{ secrets.GH_HELM_BOT_TOKEN }} custom_tag: ${{ steps.check_version_in_PR.outputs.PR_version }} tag_prefix: "" - commit_sha: ${{ steps.master_sha.outputs.origin_master_sha }} + commit_sha: ${{ steps.main_sha.outputs.origin_main_sha }} - name: Wait for image build to complete # Quay is configured to automatically build our image. This waits