Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,9 @@ jobs:
# Note: These next three have to be checked as strings ('true'/'false')!
is_develop: ${{ github.ref == 'refs/heads/develop' }}
is_release: ${{ startsWith(github.ref, 'refs/heads/release/') }}
is_gitflow_sync: |
github.event_name == 'pull_request' &&
(github.head_ref == 'refs/heads/develop' || github.head_ref == 'refs/heads/master') &&
contains(steps.pr-labels.outputs.labels, ' Dev: Gitflow ')
is_gitflow_sync: ${{ github.head_ref == 'refs/heads/develop' || github.head_ref == 'refs/heads/master' }}
has_gitflow_label:
${{ github.event_name == 'pull_request' && contains(steps.pr-labels.outputs.labels, ' Gitflow ') }}
force_skip_cache:
${{ github.event_name == 'pull_request' && contains(steps.pr-labels.outputs.labels, ' ci-skip-cache ') }}

Expand All @@ -150,7 +149,7 @@ jobs:
runs-on: ubuntu-20.04
timeout-minutes: 15
if: |
needs.job_get_metadata.outputs.is_gitflow_sync == 'false' &&
(needs.job_get_metadata.outputs.is_gitflow_sync == 'false' && needs.job_get_metadata.outputs.has_gitflow_label == 'false') &&
(needs.job_get_metadata.outputs.changed_any_code == 'true' || github.event_name != 'pull_request')
steps:
- name: 'Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/gitflow-sync-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:
name: Create PR develop->master
runs-on: ubuntu-20.04
if: |
github.event.pull_request.merged == true
&& startsWith(github.event.pull_request.title, "meta(changelog):")
github.event.pull_request.merged == true &&
startsWith(github.event.pull_request.title, 'meta(changelog):')
permissions:
pull-requests: write
contents: write
Expand Down Expand Up @@ -55,8 +55,8 @@ jobs:
skipped:
runs-on: ubuntu-20.04
if: |
github.event.pull_request.merged == false
|| startsWith(github.event.pull_request.title, "meta(changelog):") == false
github.event.pull_request.merged == false ||
startsWith(github.event.pull_request.title, 'meta(changelog):') == false
steps:
- name: Sync skipped
run: echo "OK"