Skip to content

Commit 7df265c

Browse files
committed
fix gitflow check?
1 parent 71b1a98 commit 7df265c

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,9 @@ jobs:
137137
# Note: These next three have to be checked as strings ('true'/'false')!
138138
is_develop: ${{ github.ref == 'refs/heads/develop' }}
139139
is_release: ${{ startsWith(github.ref, 'refs/heads/release/') }}
140-
is_gitflow_sync: |
141-
github.event_name == 'pull_request' &&
142-
(github.head_ref == 'refs/heads/develop' || github.head_ref == 'refs/heads/master') &&
143-
contains(steps.pr-labels.outputs.labels, ' Dev: Gitflow ')
140+
is_gitflow_sync: ${{ github.head_ref == 'refs/heads/develop' || github.head_ref == 'refs/heads/master' }}
141+
has_gitflow_label:
142+
${{ github.event_name == 'pull_request' && contains(steps.pr-labels.outputs.labels, ' Gitflow ') }}
144143
force_skip_cache:
145144
${{ github.event_name == 'pull_request' && contains(steps.pr-labels.outputs.labels, ' ci-skip-cache ') }}
146145

@@ -150,7 +149,7 @@ jobs:
150149
runs-on: ubuntu-20.04
151150
timeout-minutes: 15
152151
if: |
153-
needs.job_get_metadata.outputs.is_gitflow_sync == 'false' &&
152+
(needs.job_get_metadata.outputs.is_gitflow_sync == 'false' && needs.job_get_metadata.outputs.has_gitflow_label == 'false') &&
154153
(needs.job_get_metadata.outputs.changed_any_code == 'true' || github.event_name != 'pull_request')
155154
steps:
156155
- name: 'Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})'

0 commit comments

Comments
 (0)