From bf169e9041a591312b2b2acfc821c390e6487e73 Mon Sep 17 00:00:00 2001 From: Marcel Koch Date: Wed, 8 Sep 2021 17:46:47 +0200 Subject: [PATCH 1/5] cancel earlier actions from same branch --- .github/workflows/osx.yml | 4 ++++ .github/workflows/windows-cygwin.yml | 4 ++++ .github/workflows/windows-mingw.yml | 4 ++++ .github/workflows/windows-msvc-cuda.yml | 4 ++++ .github/workflows/windows-msvc-ref.yml | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml index 5807599e800..e5cb5ab1bde 100644 --- a/.github/workflows/osx.yml +++ b/.github/workflows/osx.yml @@ -9,6 +9,10 @@ on: required: false default: false +concurrency: + group: ${{ github.workflow}}-${{ github.ref }} + cancel-in-progress: true + jobs: osx-clang-omp: strategy: diff --git a/.github/workflows/windows-cygwin.yml b/.github/workflows/windows-cygwin.yml index 253a5dd38f6..69a1f88fcdd 100644 --- a/.github/workflows/windows-cygwin.yml +++ b/.github/workflows/windows-cygwin.yml @@ -9,6 +9,10 @@ on: required: false default: false +concurrency: + group: ${{ github.workflow}}-${{ github.ref }} + cancel-in-progress: true + jobs: windows_cygwin: strategy: diff --git a/.github/workflows/windows-mingw.yml b/.github/workflows/windows-mingw.yml index 7e774c3cc21..c8937248d9f 100644 --- a/.github/workflows/windows-mingw.yml +++ b/.github/workflows/windows-mingw.yml @@ -9,6 +9,10 @@ on: required: false default: false +concurrency: + group: ${{ github.workflow}}-${{ github.ref }} + cancel-in-progress: true + jobs: windows_mingw: strategy: diff --git a/.github/workflows/windows-msvc-cuda.yml b/.github/workflows/windows-msvc-cuda.yml index e2c0a3b8c43..0238190a2ef 100644 --- a/.github/workflows/windows-msvc-cuda.yml +++ b/.github/workflows/windows-msvc-cuda.yml @@ -9,6 +9,10 @@ on: required: false default: false +concurrency: + group: ${{ github.workflow}}-${{ github.ref }} + cancel-in-progress: true + jobs: windows_cuda: strategy: diff --git a/.github/workflows/windows-msvc-ref.yml b/.github/workflows/windows-msvc-ref.yml index 8768b1b15b6..6415eb04284 100644 --- a/.github/workflows/windows-msvc-ref.yml +++ b/.github/workflows/windows-msvc-ref.yml @@ -9,6 +9,10 @@ on: required: false default: false +concurrency: + group: ${{ github.workflow}}-${{ github.ref }} + cancel-in-progress: true + jobs: windows_ref: strategy: From 7e81ca7270730528a0d29e8f41bda90c3624fc89 Mon Sep 17 00:00:00 2001 From: Tobias Ribizel Date: Wed, 16 Feb 2022 12:25:25 +0100 Subject: [PATCH 2/5] cancel jobs for PRs only Related docs: https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#example-using-a-fallback-value --- .github/workflows/bot-pr-created.yml | 1 - .github/workflows/bot-pr-updated.yml | 4 +++- .github/workflows/osx.yml | 9 ++++++++- .github/workflows/windows-cygwin.yml | 9 ++++++++- .github/workflows/windows-mingw.yml | 9 ++++++++- .github/workflows/windows-msvc-cuda.yml | 9 ++++++++- .github/workflows/windows-msvc-ref.yml | 9 ++++++++- 7 files changed, 43 insertions(+), 7 deletions(-) diff --git a/.github/workflows/bot-pr-created.yml b/.github/workflows/bot-pr-created.yml index aa306e1f3aa..8342ef101be 100644 --- a/.github/workflows/bot-pr-created.yml +++ b/.github/workflows/bot-pr-created.yml @@ -1,7 +1,6 @@ on: pull_request_target: types: [opened] - name: OnNewPR jobs: label: diff --git a/.github/workflows/bot-pr-updated.yml b/.github/workflows/bot-pr-updated.yml index 9c7c73c9414..81252e5035d 100644 --- a/.github/workflows/bot-pr-updated.yml +++ b/.github/workflows/bot-pr-updated.yml @@ -1,8 +1,10 @@ on: pull_request_target: types: [opened,synchronize] - name: OnSyncPR +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref }} + cancel-in-progress: true jobs: check-format: runs-on: ubuntu-18.04 diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml index e5cb5ab1bde..7ead69428cd 100644 --- a/.github/workflows/osx.yml +++ b/.github/workflows/osx.yml @@ -2,6 +2,13 @@ name: OSX-build on: push: + branches: + - 'master' + - 'develop' + tags: + - '**' + pull_request_target: + types: [opened,synchronize] workflow_dispatch: inputs: debug_enabled: @@ -10,7 +17,7 @@ on: default: false concurrency: - group: ${{ github.workflow}}-${{ github.ref }} + group: ${{ github.workflow }}-${{ (github.head_ref && github.ref) || github.run_id }} cancel-in-progress: true jobs: diff --git a/.github/workflows/windows-cygwin.yml b/.github/workflows/windows-cygwin.yml index 69a1f88fcdd..d7d4461babc 100644 --- a/.github/workflows/windows-cygwin.yml +++ b/.github/workflows/windows-cygwin.yml @@ -2,6 +2,13 @@ name: Windows-Cygwin on: push: + branches: + - 'master' + - 'develop' + tags: + - '**' + pull_request_target: + types: [opened,synchronize] workflow_dispatch: inputs: debug_enabled: @@ -10,7 +17,7 @@ on: default: false concurrency: - group: ${{ github.workflow}}-${{ github.ref }} + group: ${{ github.workflow }}-${{ (github.head_ref && github.ref) || github.run_id }} cancel-in-progress: true jobs: diff --git a/.github/workflows/windows-mingw.yml b/.github/workflows/windows-mingw.yml index c8937248d9f..d5d0aa6147b 100644 --- a/.github/workflows/windows-mingw.yml +++ b/.github/workflows/windows-mingw.yml @@ -2,6 +2,13 @@ name: Windows-MinGW on: push: + branches: + - 'master' + - 'develop' + tags: + - '**' + pull_request_target: + types: [opened,synchronize] workflow_dispatch: inputs: debug_enabled: @@ -10,7 +17,7 @@ on: default: false concurrency: - group: ${{ github.workflow}}-${{ github.ref }} + group: ${{ github.workflow }}-${{ (github.head_ref && github.ref) || github.run_id }} cancel-in-progress: true jobs: diff --git a/.github/workflows/windows-msvc-cuda.yml b/.github/workflows/windows-msvc-cuda.yml index 0238190a2ef..c6d93089ef6 100644 --- a/.github/workflows/windows-msvc-cuda.yml +++ b/.github/workflows/windows-msvc-cuda.yml @@ -2,6 +2,13 @@ name: Windows-MSVC-CUDA (compile-only) on: push: + branches: + - 'master' + - 'develop' + tags: + - '**' + pull_request_target: + types: [opened,synchronize] workflow_dispatch: inputs: debug_enabled: @@ -10,7 +17,7 @@ on: default: false concurrency: - group: ${{ github.workflow}}-${{ github.ref }} + group: ${{ github.workflow }}-${{ (github.head_ref && github.ref) || github.run_id }} cancel-in-progress: true jobs: diff --git a/.github/workflows/windows-msvc-ref.yml b/.github/workflows/windows-msvc-ref.yml index 6415eb04284..24d7a8755f3 100644 --- a/.github/workflows/windows-msvc-ref.yml +++ b/.github/workflows/windows-msvc-ref.yml @@ -2,6 +2,13 @@ name: Windows-MSVC-Reference on: push: + branches: + - 'master' + - 'develop' + tags: + - '**' + pull_request_target: + types: [opened,synchronize] workflow_dispatch: inputs: debug_enabled: @@ -10,7 +17,7 @@ on: default: false concurrency: - group: ${{ github.workflow}}-${{ github.ref }} + group: ${{ github.workflow }}-${{ (github.head_ref && github.ref) || github.run_id }} cancel-in-progress: true jobs: From 4726f4a2db0ecb0b98d407d47235499ba629c46a Mon Sep 17 00:00:00 2001 From: Tobias Ribizel Date: Wed, 16 Feb 2022 13:16:20 +0100 Subject: [PATCH 3/5] use pull_request instead of pull_request_target also run jobs on release/** branches --- .github/workflows/osx.yml | 3 ++- .github/workflows/windows-cygwin.yml | 3 ++- .github/workflows/windows-mingw.yml | 3 ++- .github/workflows/windows-msvc-cuda.yml | 3 ++- .github/workflows/windows-msvc-ref.yml | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml index 7ead69428cd..c085af59940 100644 --- a/.github/workflows/osx.yml +++ b/.github/workflows/osx.yml @@ -5,9 +5,10 @@ on: branches: - 'master' - 'develop' + - 'release/**' tags: - '**' - pull_request_target: + pull_request: types: [opened,synchronize] workflow_dispatch: inputs: diff --git a/.github/workflows/windows-cygwin.yml b/.github/workflows/windows-cygwin.yml index d7d4461babc..43b87414cf3 100644 --- a/.github/workflows/windows-cygwin.yml +++ b/.github/workflows/windows-cygwin.yml @@ -5,9 +5,10 @@ on: branches: - 'master' - 'develop' + - 'release/**' tags: - '**' - pull_request_target: + pull_request: types: [opened,synchronize] workflow_dispatch: inputs: diff --git a/.github/workflows/windows-mingw.yml b/.github/workflows/windows-mingw.yml index d5d0aa6147b..c01ca13a437 100644 --- a/.github/workflows/windows-mingw.yml +++ b/.github/workflows/windows-mingw.yml @@ -5,9 +5,10 @@ on: branches: - 'master' - 'develop' + - 'release/**' tags: - '**' - pull_request_target: + pull_request: types: [opened,synchronize] workflow_dispatch: inputs: diff --git a/.github/workflows/windows-msvc-cuda.yml b/.github/workflows/windows-msvc-cuda.yml index c6d93089ef6..c6a14c2d9f5 100644 --- a/.github/workflows/windows-msvc-cuda.yml +++ b/.github/workflows/windows-msvc-cuda.yml @@ -5,9 +5,10 @@ on: branches: - 'master' - 'develop' + - 'release/**' tags: - '**' - pull_request_target: + pull_request: types: [opened,synchronize] workflow_dispatch: inputs: diff --git a/.github/workflows/windows-msvc-ref.yml b/.github/workflows/windows-msvc-ref.yml index 24d7a8755f3..0d04459ee0c 100644 --- a/.github/workflows/windows-msvc-ref.yml +++ b/.github/workflows/windows-msvc-ref.yml @@ -5,9 +5,10 @@ on: branches: - 'master' - 'develop' + - 'release/**' tags: - '**' - pull_request_target: + pull_request: types: [opened,synchronize] workflow_dispatch: inputs: From 585c9c6eb797fb2caaf6a2622caa14ec2c937003 Mon Sep 17 00:00:00 2001 From: Tobias Ribizel Date: Wed, 16 Feb 2022 13:26:15 +0100 Subject: [PATCH 4/5] disable abidiff failing --- .github/abidiff.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/abidiff.sh b/.github/abidiff.sh index be9ad1d9942..8c644dcfa38 100755 --- a/.github/abidiff.sh +++ b/.github/abidiff.sh @@ -6,4 +6,4 @@ popd bot_delete_comments_matching "Note: This PR changes the Ginkgo ABI" -abidiff build-old/lib/libginkgod.so build-new/lib/libginkgod.so &> abi.diff || (bot_comment "Note: This PR changes the Ginkgo ABI:\n\`\`\`\n$(head -n2 abi.diff | tr '\n' ';' | sed 's/;/\\n/g')\`\`\`\nFor details check the full ABI diff under **Artifacts** [here]($JOB_URL)" && false) +abidiff build-old/lib/libginkgod.so build-new/lib/libginkgod.so &> abi.diff || (bot_comment "Note: This PR changes the Ginkgo ABI:\n\`\`\`\n$(head -n2 abi.diff | tr '\n' ';' | sed 's/;/\\n/g')\`\`\`\nFor details check the full ABI diff under **Artifacts** [here]($JOB_URL)") From 0f23f6c2ecfe3eb8b33215071bf4a27ac08e0d8d Mon Sep 17 00:00:00 2001 From: Tobias Ribizel Date: Wed, 16 Feb 2022 14:13:11 +0100 Subject: [PATCH 5/5] fix formatting/abidiff action concurrency group --- .github/workflows/bot-pr-updated.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bot-pr-updated.yml b/.github/workflows/bot-pr-updated.yml index 81252e5035d..442471e875c 100644 --- a/.github/workflows/bot-pr-updated.yml +++ b/.github/workflows/bot-pr-updated.yml @@ -3,7 +3,7 @@ on: types: [opened,synchronize] name: OnSyncPR concurrency: - group: ${{ github.workflow }}-${{ github.head_ref }} + group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: check-format: