Merge pull request #262 from khaledsulayman/ks-auto-merge

instructlab · Sep 12, 2024 · b5807a7 · b5807a7
2 parents b9d41ee + 4c47c95
commit b5807a7
Show file tree

Hide file tree

Showing 4 changed files with 83 additions and 2 deletions.
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -1,4 +1,74 @@
 pull_request_rules:
+- name: auto-merge
+  description: Automatically merge to main with >= 2 approvals. All requested reviews have given feedback, no changes requested, and CI has passed.
+  conditions:
+    - "#approved-reviews-by>=2"
+    - "#review-requested=0"
+    - "#changes-requested-reviews-by=0"
+    - label!=hold
+    - label!=do-not-merge
+    - label!=needs-rebase
+    - check-success=DCO
+
+    - or:
+      # base branch is main or a release branch
+      - base=main
+      - base~=^release-
+
+    # If workflow configuration files in .github/ are changed, the actionlint check must pass
+    - or:
+
+      - and:
+        - check-success=actionlint
+        - or:
+          - files~=^\.github/(actions|workflows)/.*\.ya?ml$
+          - files~=^\.github/workflows/actionlint\.
+      - and:
+        # files matching the below patterns are unchanged
+        - -files~=^\.github/(actions|workflows)/.*\.ya?ml$
+        - -files~=^\.github/workflows/actionlint\.
+
+    # e2e workflow
+    - or:
+      - and:
+        - check-success=e2e-workflow-complete
+        - or:
+          - files~=\.py$
+          - files=pyproject.toml
+          - files=^requirements.*\.txt$
+          - files=.github/workflows/e2e-nvidia-t4-x1.yml
+      - and:
+        - -files~=\.py$
+        - -files=pyproject.toml
+        - -files~=^requirements.*\.txt$
+        - -files=.github/workflows/e2e-nvidia-t4-x1.yml
+
+    # lint must pass if files change that would trigger this job
+    - or:
+      - and:
+        - check-success=lint-workflow-complete
+        - or:
+          # see .github/workflows/lint.yml and test.yml
+          - files~=\.py$
+          - files=pyproject.toml
+          - files~=^requirements.*\.txt$
+          - files=tox.ini
+          - files~=^scripts/[^/]+\.sh$
+          - files~=^src/instructlab/sdg/pipelines/
+          - files=.github/workflows/lint.yml
+      - and:
+        - -files~=\.py$
+        - -files=pyproject.toml
+        - -files~=^requirements.*\.txt$
+        - -files=tox.ini
+        - -files~=^scripts/[^/]+\.sh$
+        - -files~=^src/instructlab/sdg/pipelines/
+        - -files=.github/workflows/lint.yml
+
+  actions:
+    merge:
+      method: merge
+    delete_head_branch:
 
 - name: label-cicd
   description: Automatically apply CI/CD label

diff --git a/.github/workflows/actionlint.yml b/.github/workflows/actionlint.yml
@@ -5,6 +5,7 @@ on:
   push:
     branches:
       - "main"
+      - "release-**"
     paths:
       - '.github/workflows/*.ya?ml'
       - '.github/workflows/actionlint.*' # This workflow

diff --git a/.github/workflows/e2e-nvidia-t4-x1.yml b/.github/workflows/e2e-nvidia-t4-x1.yml
@@ -7,6 +7,11 @@ on:
     branches:
       - main
       - release-*
+    paths:
+      - "**.py"
+      - "pyproject.toml"
+      - "requirements**.txt"
+      - ".github/workflows/e2e-nvidia-t4-x1.yml" # This workflow
   pull_request_target:
     types:
       - opened
@@ -15,6 +20,11 @@ on:
     branches:
       - main
       - release-*
+    paths:
+      - "**.py"
+      - "pyproject.toml"
+      - "requirements**.txt"
+      - ".github/workflows/e2e-nvidia-t4-x1.yml" # This workflow
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -13,7 +13,7 @@ on:
       - 'requirements*.txt'
       - 'tox.ini'
       - 'scripts/*.sh'
-      - '.github/**'
+      - '.github/workflows/lint.yml'
       - 'src/instructlab/sdg/pipelines/**'
   pull_request:
     branches:
@@ -25,7 +25,7 @@ on:
       - 'requirements*.txt'
       - 'tox.ini'
       - 'scripts/*.sh'
-      - '.github/**'
+      - '.github/workflows/lint.yml'
       - 'src/instructlab/sdg/pipelines/**'
 
 env: