From ec9ea676e31fea692907fa70fa1459d902c60646 Mon Sep 17 00:00:00 2001 From: Stacky McStackface <95074132+stackable-bot@users.noreply.github.com> Date: Wed, 29 Jan 2025 08:52:21 +0100 Subject: [PATCH] chore: Generated commit to update templated files since the last template run up to stackabletech/operator-templating@34039ec864da8620f3b8f10299e8885ed8ea4c85 (#817) Reference-to: stackabletech/operator-templating@34039ec (PR-version change conditions to be mutually exclusive) --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8a8a435a..06f1b754 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -356,7 +356,7 @@ jobs: # For PRs to be merged against a release branch, use the version that has already been set in the calling script. # We can't rely on cargo set-version here as we will break semver rules when changing the version to make it # specific to this PR e.g. 1.2.0 --> 1.2.0-pr678, so set it manually. - if: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/main' }} + if: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref != 'main' }} env: PR_NUMBER: ${{ github.event.pull_request.number }} shell: bash @@ -440,7 +440,7 @@ jobs: # For PRs to be merged against a release branch, use the version that has already been set in the calling script. # We can't rely on cargo set-version here as we will break semver rules when changing the version to make it # specific to this PR e.g. 1.2.0 --> 1.2.0-pr678, so set it manually. - if: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/main' }} + if: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref != 'main' }} env: PR_NUMBER: ${{ github.event.pull_request.number }} shell: bash