This should work

project-codeflare · Oct 24, 2024 · 17e6487 · 17e6487
1 parent 13658b8
commit 17e6487
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 27 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -13,7 +13,7 @@ updates:
     ignore:
       - dependency-name: "*"
         update-types: ["version-update:semver-patch"]
-    open-pull-requests-limit: 4
+    open-pull-requests-limit: 1
     labels:
       - "dependabot"
       - "test-guided-notebooks"

diff --git a/.github/workflows/dependabot-labeler.yaml b/.github/workflows/dependabot-labeler.yaml
@@ -5,10 +5,10 @@ name: Dependabot Labeler
 on:
   pull_request:
     types: [ labeled, synchronize, opened, reopened ]
-
+# TODO: CHANGE BACK
 jobs:
     add-approve-lgtm-label:
-        if: ${{ github.actor == 'dependabot[bot]' && contains(github.event.pull_request.labels.*.name, 'dependabot') }}
+        if: ${{ contains(github.event.pull_request.labels.*.name, 'dependabot') }}
         runs-on: ubuntu-latest
 
         # Permission required to edit a PR
@@ -24,4 +24,4 @@ jobs:
               run: |
                   gh pr edit ${{ github.event.pull_request.number }} --add-label "lgtm" --add-label "approved"
               env:
-                GITHUB_TOKEN: ${{ secrets.CODEFLARE_MACHINE_ACCOUNT_TOKEN }}
+                GITHUB_TOKEN: ${{ secrets.GH_CLI_TOKEN }}
diff --git a/.github/workflows/e2e_tests.yaml b/.github/workflows/e2e_tests.yaml
@@ -3,7 +3,6 @@ name: e2e
 
 on:
   pull_request:
-    types: [ labeled, synchronize, opened, reopened ]
     branches:
       - main
       - 'release-*'
@@ -12,16 +11,6 @@ on:
       - '**.adoc'
       - '**.md'
       - 'LICENSE'
-  push:
-    branches:
-      - main
-      - 'release-*'
-    paths-ignore:
-      - 'docs/**'
-      - '**.adoc'
-      - '**.md'
-      - 'LICENSE'
-  merge_group:
 
 concurrency:
   group: ${{ github.head_ref }}-${{ github.workflow }}
@@ -32,7 +21,6 @@ env:
 
 jobs:
   kubernetes:
-    if: contains(github.event.pull_request.labels.*.name, 'e2e') || github.event_name == 'merge_group'
     runs-on: ubuntu-20.04-4core-gpu
 
     steps:

diff --git a/.github/workflows/guided_notebook_tests.yaml b/.github/workflows/guided_notebook_tests.yaml
@@ -13,7 +13,7 @@ env:
 
 jobs:
   verify-0_basic_ray:
-    if: contains(github.event.pull_request.labels.*.name, 'test-guided-notebooks')
+    if: ${{ contains(github.event.pull_request.labels.*.name, 'test-guided-notebooks') }}
     runs-on: ubuntu-20.04-4core
 
     steps:

diff --git a/.github/workflows/pre-commit.yaml b/.github/workflows/pre-commit.yaml
@@ -1,13 +1,7 @@
 name: Pre-commit
 on:
-  push:
-    branches:
-      - '**'
-    tags-ignore:
-      - 'v*'
   pull_request:
   workflow_dispatch:
-  merge_group:
 
 jobs:
   precommit:

diff --git a/.github/workflows/ui_notebooks_test.yaml b/.github/workflows/ui_notebooks_test.yaml
@@ -13,7 +13,7 @@ env:
 
 jobs:
   verify-3_widget_example:
-    if: contains(github.event.pull_request.labels.*.name, 'test-guided-notebooks') || contains(github.event.pull_request.labels.*.name, 'test-ui-notebooks')
+    if: ${{ contains(github.event.pull_request.labels.*.name, 'test-guided-notebooks') || contains(github.event.pull_request.labels.*.name, 'test-ui-notebooks') }}
     runs-on: ubuntu-20.04-4core
 
     steps:

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -1,11 +1,8 @@
 name: Python Tests
 
 on:
-  push:
-    branches: [ main ]
   pull_request:
     branches: [ main ]
-  merge_group:
 
 jobs:
   unit-tests: