rebase

Flagsmith · Jul 31, 2024 · c18358e · c18358e
1 parent 09e1b61
commit c18358e
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 23 deletions.
diff --git a/.github/workflows/conventional-commit.yml b/.github/workflows/conventional-commit.yml
@@ -3,14 +3,11 @@ name: Conventional Commit
 on:
   pull_request:
     types: [opened, synchronize, reopened, ready_for_review]
-    branches-ignore:
-      - release-please-*
+
 jobs:
   conventional-commit:
     name: Conventional Commit
     runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
     steps:
       - name: Check PR Conventional Commit title
         uses: amannn/action-semantic-pull-request@v5
@@ -28,20 +25,3 @@ jobs:
             refactor
             test
             chore
-      - name: Auto-label PR with Conventional Commit title
-        uses: kramen22/conventional-release-labels@v1
-        with:
-          type_labels: |
-            {
-              "feat": "feature",
-              "fix": "fix",
-              "infra": "infrastructure",
-              "ci": "ci-cd",
-              "docs": "docs",
-              "deps": "dependencies",
-              "perf": "performance",
-              "refactor": "refactor",
-              "test": "testing",
-              "chore": "chore"
-            }
-          ignored_types: '[]'
diff --git a/.github/workflows/platform-pull-request.yml b/.github/workflows/platform-pull-request.yml
@@ -6,8 +6,6 @@ on:
     paths-ignore:
       - docs/**
       - infrastructure/**
-    branches-ignore:
-      - release-please-*
 
 jobs:
   permissions-check:
@@ -21,6 +19,32 @@ jobs:
         with:
           require: write
 
+  conventional-commit-label:
+    if: needs.permissions-check.outputs.can-write == 'true'
+    name: Add Conventional Commit labels
+    needs: permissions-check
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+      - name: Auto-label PR with Conventional Commit title
+        uses: kramen22/conventional-release-labels@v1
+        with:
+          type_labels: |
+            {
+              "feat": "feature",
+              "fix": "fix",
+              "infra": "infrastructure",
+              "ci": "ci-cd",
+              "docs": "docs",
+              "deps": "dependencies",
+              "perf": "performance",
+              "refactor": "refactor",
+              "test": "testing",
+              "chore": "chore"
+            }
+          ignored_types: '[]'
+
   docker-prepare-report-comment:
     if: github.event.pull_request.draft == false && needs.permissions-check.outputs.can-write == 'true'
     name: Prepare Docker report comment