Skip to content

Commit b660d6d

Browse files
authored
Merge pull request #1985 from pllim/use-builtin-ci-skip
TST: Remove custom CI skip
2 parents 0cb20ae + 62d150e commit b660d6d

File tree

2 files changed

+2
-24
lines changed

2 files changed

+2
-24
lines changed

.github/workflows/ci_tests.yml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,10 @@ jobs:
1717
cancel_ci:
1818
name: Mandatory checks before CI
1919
runs-on: ubuntu-latest
20-
outputs:
21-
run_next: ${{ steps.skip_ci_step.outputs.run_next }}
2220
steps:
23-
- name: Check skip CI
24-
uses: OpenAstronomy/action-skip-ci@main
25-
id: skip_ci_step
26-
with:
27-
NO_FAIL: true
28-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
29-
# This should only run if we did not skip CI
21+
# TODO: Fix this for PRs
3022
- name: Cancel Previous Runs
3123
uses: styfle/cancel-workflow-action@ce177499ccf9fd2aded3b0426c97e5434c2e8a73
32-
if: steps.skip_ci_step.outputs.run_next == 'true'
3324
with:
3425
access_token: ${{ secrets.GITHUB_TOKEN }}
3526

@@ -39,7 +30,6 @@ jobs:
3930
name: ${{ matrix.name }}
4031
runs-on: ${{ matrix.os }}
4132
needs: cancel_ci
42-
if: needs.cancel_ci.outputs.run_next == 'true'
4333
strategy:
4434
fail-fast: true
4535
matrix:
@@ -124,7 +114,6 @@ jobs:
124114
name: egg_info with Python 3.7
125115
runs-on: ubuntu-latest
126116
needs: cancel_ci
127-
if: needs.cancel_ci.outputs.run_next == 'true'
128117
steps:
129118
- name: Checkout code
130119
uses: actions/checkout@v2

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,10 @@ jobs:
2222
cancel_ci:
2323
name: Mandatory checks before CI
2424
runs-on: ubuntu-latest
25-
outputs:
26-
run_next: ${{ steps.skip_ci_step.outputs.run_next }}
2725
steps:
28-
- name: Check skip CI
29-
uses: OpenAstronomy/action-skip-ci@main
30-
id: skip_ci_step
31-
with:
32-
NO_FAIL: true
33-
SKIP_DIRECTIVES: '[skip ci],[ci skip],[skip codeql],[codeql skip]'
34-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
35-
# This should only run if we did not skip CI
26+
# TODO: Fix this for PRs
3627
- name: Cancel Previous Runs
3728
uses: styfle/cancel-workflow-action@ce177499ccf9fd2aded3b0426c97e5434c2e8a73
38-
if: steps.skip_ci_step.outputs.run_next == 'true'
3929
with:
4030
access_token: ${{ secrets.GITHUB_TOKEN }}
4131

@@ -45,7 +35,6 @@ jobs:
4535
name: Analyze
4636
runs-on: ubuntu-latest
4737
needs: cancel_ci
48-
if: needs.cancel_ci.outputs.run_next == 'true'
4938

5039
strategy:
5140
fail-fast: false

0 commit comments

Comments
 (0)