From 395c6a444b1b3e916e0c04e6498362f40c20c770 Mon Sep 17 00:00:00 2001 From: Daniel Szoke Date: Mon, 28 Oct 2024 13:55:55 +0100 Subject: [PATCH 1/2] ci: Run CodeQL action on all PRs This action only is triggered on PRs to `master`, but the action is required. This becomes a problem when a PR is opened against a branch other than `master` (e.g. as part of a PR tree). When the parent branch is merged to `master`, the PR's base automatically changes to `master`, but this action does not get triggered. Instead, it blocks on "Expected" and can only be run by adding commits to the branch. Running the action on PRs against any branch should fix this. Also, add logic to cancel in-progress workflows on pull requests (logic taken from our other actions) --- .github/workflows/codeql-analysis.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 573c49fb01..d95353c652 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -17,13 +17,15 @@ on: - master - sentry-sdk-2.0 pull_request: - # The branches below must be a subset of the branches above - branches: - - master - - sentry-sdk-2.0 schedule: - cron: '18 18 * * 3' +# Cancel in progress workflows on pull_requests. +# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} + cancel-in-progress: true + permissions: contents: read From 2a724822edbf0d982e4e64bc7d022114c63831a6 Mon Sep 17 00:00:00 2001 From: Daniel Szoke Date: Mon, 28 Oct 2024 13:57:56 +0100 Subject: [PATCH 2/2] ci: Run license compliance action on all PRs This action only is triggered on PRs to master, but the action is required. This becomes a problem when a PR is opened against a branch other than master (e.g. as part of a PR tree). When the parent branch is merged to master, the PR's base automatically changes to master, but this action does not get triggered. Instead, it blocks on "Expected" and can only be run by adding commits to the branch. Running the action on PRs against any branch should fix this. Also, add logic to cancel in-progress workflows on pull requests (logic taken from our other actions) --- .github/workflows/enforce-license-compliance.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/enforce-license-compliance.yml b/.github/workflows/enforce-license-compliance.yml index 01e02ccb8b..ef79ed112b 100644 --- a/.github/workflows/enforce-license-compliance.yml +++ b/.github/workflows/enforce-license-compliance.yml @@ -8,10 +8,11 @@ on: - release/* - sentry-sdk-2.0 pull_request: - branches: - - master - - main - - sentry-sdk-2.0 + +# Cancel in progress workflows on pull_requests. +# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} jobs: enforce-license-compliance: