Skip to content

Commit 7532522

Browse files
authored
ci: Fix invalid yaml (#7034)
1 parent 5e05e04 commit 7532522

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

.github/workflows/build.yml

+4-5
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 }})'

.github/workflows/gitflow-sync-master.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
name: Create PR develop->master
1515
runs-on: ubuntu-20.04
1616
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):')
1919
permissions:
2020
pull-requests: write
2121
contents: write
@@ -55,8 +55,8 @@ jobs:
5555
skipped:
5656
runs-on: ubuntu-20.04
5757
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
6060
steps:
6161
- name: Sync skipped
6262
run: echo "OK"

0 commit comments

Comments
 (0)