From 854190f5aeee4349db56f58504e8880fe1a5ad7e Mon Sep 17 00:00:00 2001 From: MilesCranmer Date: Fri, 21 Jun 2024 20:30:21 +0100 Subject: [PATCH] ci: always run pull request job --- .github/workflows/CI.yml | 1 + .github/workflows/CI_Windows.yml | 1 + .github/workflows/CI_conda_forge.yml | 12 ------------ .github/workflows/CI_docker.yml | 1 + .github/workflows/CI_mac.yml | 1 + 5 files changed, 4 insertions(+), 12 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index b58984198..43ea2584f 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -24,6 +24,7 @@ jobs: uses: fkirc/skip-duplicate-actions@v5 with: concurrent_skipping: 'same_content_newer' + do_not_skip: '["pull_request"]' test: needs: pre_job diff --git a/.github/workflows/CI_Windows.yml b/.github/workflows/CI_Windows.yml index d4762cfe6..672e63474 100644 --- a/.github/workflows/CI_Windows.yml +++ b/.github/workflows/CI_Windows.yml @@ -24,6 +24,7 @@ jobs: uses: fkirc/skip-duplicate-actions@v5 with: concurrent_skipping: 'same_content_newer' + do_not_skip: '["pull_request"]' test: needs: pre_job diff --git a/.github/workflows/CI_conda_forge.yml b/.github/workflows/CI_conda_forge.yml index 35fe39226..98d064b93 100644 --- a/.github/workflows/CI_conda_forge.yml +++ b/.github/workflows/CI_conda_forge.yml @@ -11,19 +11,7 @@ on: workflow_dispatch: jobs: - pre_job: - runs-on: ubuntu-latest - outputs: - should_skip: ${{ steps.skip_check.outputs.should_skip }} - steps: - - id: skip_check - uses: fkirc/skip-duplicate-actions@v5 - with: - concurrent_skipping: 'same_content_newer' - conda_test: - needs: pre_job - if: needs.pre_job.outputs.should_skip != 'true' runs-on: ${{ matrix.os }} timeout-minutes: 60 defaults: diff --git a/.github/workflows/CI_docker.yml b/.github/workflows/CI_docker.yml index 2391caafe..366df7044 100644 --- a/.github/workflows/CI_docker.yml +++ b/.github/workflows/CI_docker.yml @@ -24,6 +24,7 @@ jobs: uses: fkirc/skip-duplicate-actions@v5 with: concurrent_skipping: 'same_content_newer' + do_not_skip: '["pull_request"]' test: needs: pre_job diff --git a/.github/workflows/CI_mac.yml b/.github/workflows/CI_mac.yml index 0212e7aba..d22692fea 100644 --- a/.github/workflows/CI_mac.yml +++ b/.github/workflows/CI_mac.yml @@ -24,6 +24,7 @@ jobs: uses: fkirc/skip-duplicate-actions@v5 with: concurrent_skipping: 'same_content_newer' + do_not_skip: '["pull_request"]' test: needs: pre_job