Merge pull request #346 from pshenmic/feat/github-ci-fix

Target branch rule for lint action
pshenmic · Nov 30, 2024 · 321cc6b · 321cc6b
2 parents 60889e2 + 430ed46
commit 321cc6b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,7 +7,7 @@ on:
     branches:
       - 'master'
   pull_request:
-    branches: [ "master" ]
+    branches: [ "master", "develop" ]
 
 env:
   REGISTRY: ghcr.io
@@ -18,8 +18,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+      - name: "Validate branch"
+        if: ${{github.base_ref == 'master'}}
+        run: exit 1
       - name: "Validate label"
-        if: | 
+        if: |
           (contains(github.event.pull_request.labels.*.name, 'backend') ||
             contains(github.event.pull_request.labels.*.name, 'data contract') || 
             contains(github.event.pull_request.labels.*.name, 'frontend') || 

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -6,6 +6,7 @@ on:
     branches:
       - "master"
       - "*.*.*"
+      - "develop"
     types:
       - completed
 
@@ -36,11 +37,11 @@ jobs:
             docker rm pe-testnet-api pe-testnet-indexer || true
 
   drop_db:
-      runs-on: ubuntu-latest
+    runs-on: ubuntu-latest
 
-      needs: stop
+    needs: stop
 
-      steps:
+    steps:
       - name: Checkout repository
         uses: actions/checkout@v4
         with: