TST: Remove custom skip CI

like astropy/astropy#11316
spacetelescope · Feb 9, 2021 · 254ddf4 · 254ddf4
1 parent e6e4df9
commit 254ddf4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 24 deletions.
diff --git a/.github/workflows/ci_workflows.yml b/.github/workflows/ci_workflows.yml
@@ -12,24 +12,14 @@ jobs:
   cancel_ci:
     name: Mandatory checks before CI
     runs-on: ubuntu-latest
-    outputs:
-      run_next: ${{ steps.skip_ci_step.outputs.run_next }}
     steps:
-    # Base branch check should run whether we skip CI or not
     - name: Check base branch
       uses: pllim/action-check_pr_basebranch@main
       with:
         BASEBRANCH_NAME: master
-    - name: Check skip CI
-      uses: OpenAstronomy/action-skip-ci@main
-      id: skip_ci_step
-      with:
-        NO_FAIL: true
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    # This should only run if we did not skip CI
+    # TODO: Fix this for PRs
     - name: Cancel Previous Runs
       uses: styfle/cancel-workflow-action@ce177499ccf9fd2aded3b0426c97e5434c2e8a73
-      if: steps.skip_ci_step.outputs.run_next == 'true'
       with:
         access_token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -38,7 +28,6 @@ jobs:
   pep_and_audit:
     runs-on: ubuntu-latest
     needs: cancel_ci
-    if: needs.cancel_ci.outputs.run_next == 'true'
     steps:
     - name: Checkout code
       uses: actions/checkout@v2
@@ -66,7 +55,6 @@ jobs:
   link_check:
     runs-on: ubuntu-latest
     needs: cancel_ci
-    if: needs.cancel_ci.outputs.run_next == 'true'
     steps:
     - name: Checkout code
       uses: actions/checkout@v2

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -22,19 +22,10 @@ jobs:
   cancel_ci:
     name: Mandatory checks before CI
     runs-on: ubuntu-latest
-    outputs:
-      run_next: ${{ steps.skip_ci_step.outputs.run_next }}
     steps:
-    - name: Check skip CI
-      uses: OpenAstronomy/action-skip-ci@main
-      id: skip_ci_step
-      with:
-        NO_FAIL: true
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    # This should only run if we did not skip CI
+    # TODO: Fix this for PRs
     - name: Cancel Previous Runs
       uses: styfle/cancel-workflow-action@ce177499ccf9fd2aded3b0426c97e5434c2e8a73
-      if: steps.skip_ci_step.outputs.run_next == 'true'
       with:
         access_token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -43,7 +34,6 @@ jobs:
   analyze:
     name: Analyze
     needs: cancel_ci
-    if: needs.cancel_ci.outputs.run_next == 'true'
     runs-on: ubuntu-latest
 
     strategy: