File tree 2 files changed +8
-9
lines changed
2 files changed +8
-9
lines changed Original file line number Diff line number Diff line change @@ -137,10 +137,9 @@ jobs:
137
137
# Note: These next three have to be checked as strings ('true'/'false')!
138
138
is_develop : ${{ github.ref == 'refs/heads/develop' }}
139
139
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 ') }}
144
143
force_skip_cache :
145
144
${{ github.event_name == 'pull_request' && contains(steps.pr-labels.outputs.labels, ' ci-skip-cache ') }}
146
145
@@ -150,7 +149,7 @@ jobs:
150
149
runs-on : ubuntu-20.04
151
150
timeout-minutes : 15
152
151
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') &&
154
153
(needs.job_get_metadata.outputs.changed_any_code == 'true' || github.event_name != 'pull_request')
155
154
steps :
156
155
- name : ' Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})'
Original file line number Diff line number Diff line change 14
14
name : Create PR develop->master
15
15
runs-on : ubuntu-20.04
16
16
if : |
17
- github.event.pull_request.merged == true
18
- && startsWith(github.event.pull_request.title, " meta(changelog):" )
17
+ github.event.pull_request.merged == true &&
18
+ startsWith(github.event.pull_request.title, ' meta(changelog):' )
19
19
permissions :
20
20
pull-requests : write
21
21
contents : write
55
55
skipped :
56
56
runs-on : ubuntu-20.04
57
57
if : |
58
- github.event.pull_request.merged == false
59
- || startsWith(github.event.pull_request.title, " meta(changelog):" ) == false
58
+ github.event.pull_request.merged == false ||
59
+ startsWith(github.event.pull_request.title, ' meta(changelog):' ) == false
60
60
steps :
61
61
- name : Sync skipped
62
62
run : echo "OK"
You can’t perform that action at this time.
0 commit comments