From 00c8cd2842b6982050b54a0a0f4c2c9600efbb4a Mon Sep 17 00:00:00 2001 From: daz Date: Wed, 10 Apr 2024 16:21:22 -0600 Subject: [PATCH] Use pull_request triggers primarily for workflows Instead of relying on push triggers in general, we now use pull_request and reserve push triggers for main and release branches. This makes the behaviour more consistent for users contributing from repository forks. However, we no longer have a quick-feedback loop for development. --- .github/workflows/ci-check-and-unit-test.yml | 4 ++++ .github/workflows/ci-check-no-dist-update.yml | 5 +---- .github/workflows/ci-codeql.yml | 2 -- .github/workflows/ci-init-script-check.yml | 4 ++++ .github/workflows/ci-integ-test.yml | 20 +++++++++---------- .github/workflows/ci-update-dist.yml | 4 ++-- 6 files changed, 20 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci-check-and-unit-test.yml b/.github/workflows/ci-check-and-unit-test.yml index 96a7def..24b6dd5 100644 --- a/.github/workflows/ci-check-and-unit-test.yml +++ b/.github/workflows/ci-check-and-unit-test.yml @@ -2,6 +2,10 @@ name: CI-check-and-unit-test on: push: + branches: + - 'main' + - 'release/**' + pull_request: permissions: contents: read diff --git a/.github/workflows/ci-check-no-dist-update.yml b/.github/workflows/ci-check-no-dist-update.yml index 515cb17..f48a095 100644 --- a/.github/workflows/ci-check-no-dist-update.yml +++ b/.github/workflows/ci-check-no-dist-update.yml @@ -3,10 +3,7 @@ name: CI-check-no-dist-update # Prohibit any change to 'dist/**' on a non-release branch on: workflow_dispatch: - push: - branches-ignore: - - 'main' - - 'release/**' + pull_request: paths: - 'dist/**' diff --git a/.github/workflows/ci-codeql.yml b/.github/workflows/ci-codeql.yml index fceeee6..4d60351 100644 --- a/.github/workflows/ci-codeql.yml +++ b/.github/workflows/ci-codeql.yml @@ -3,8 +3,6 @@ name: CI-codeql on: push: branches: [ "main" ] - pull_request: - branches: [ "main" ] schedule: - cron: '25 23 * * 2' diff --git a/.github/workflows/ci-init-script-check.yml b/.github/workflows/ci-init-script-check.yml index 454ab0b..9446671 100644 --- a/.github/workflows/ci-init-script-check.yml +++ b/.github/workflows/ci-init-script-check.yml @@ -2,6 +2,10 @@ name: CI-init-script-check on: push: + branches: + - 'main' + - 'release/**' + pull_request: paths: - '.github/workflows/ci-init-script-check.yml' - 'sources/src/resources/init-scripts/**' diff --git a/.github/workflows/ci-integ-test.yml b/.github/workflows/ci-integ-test.yml index 748a4fd..6c4aa13 100644 --- a/.github/workflows/ci-integ-test.yml +++ b/.github/workflows/ci-integ-test.yml @@ -2,7 +2,11 @@ name: CI-integ-test on: workflow_dispatch: + pull_request: push: + branches: + - 'main' + - 'release/**' jobs: determine-suite: @@ -11,9 +15,6 @@ jobs: runner-os: ${{ steps.determine-suite.outputs.suite == 'quick' && '["ubuntu-latest"]' || '["ubuntu-latest", "windows-latest", "macos-latest"]' }} cache-key-prefix: ${{ steps.determine-suite.outputs.suite == 'quick' && '0' || github.run_number }} steps: - - name: Get current PR details - uses: 8BitJonny/gh-get-current-pr@3.0.0 - id: PR - name: Determine suite to run id: determine-suite run: | @@ -32,14 +33,11 @@ jobs: exit 0 fi - # Run full suite for PRs - if [ "${{ steps.PR.outputs.pr_found }}" == "false" ]; then - echo "PR not found: suite=quick" - echo "suite=quick" >> "$GITHUB_OUTPUT" - else - echo "PR found: suite=full" - echo "suite=full" >> "$GITHUB_OUTPUT" - fi + # TODO: Make it easy to experiment with no PR and quick suite + + # Run full suite for everything else + echo "Everything else: suite=full" + echo "suite=full" >> "$GITHUB_OUTPUT" build-distribution: runs-on: ubuntu-latest diff --git a/.github/workflows/ci-update-dist.yml b/.github/workflows/ci-update-dist.yml index 5b42a4a..fee1f5b 100644 --- a/.github/workflows/ci-update-dist.yml +++ b/.github/workflows/ci-update-dist.yml @@ -4,8 +4,8 @@ on: workflow_dispatch: push: branches: - - 'main' - - 'release/**' + - 'main' + - 'release/**' permissions: contents: write