feat: some flow improvements

algolia · Nov 22, 2024 · 35badbb · 35badbb
1 parent 47c7681
commit 35badbb
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,9 +3,11 @@ name: CI
 on:
   push:
     branches: [ master, develop, feat/e2e-circleci, github-actions ]
+  pull_request:
 
 jobs:
   build:
+    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.base_ref == 'develop')
     runs-on: ubuntu-latest
 
     env:
@@ -34,12 +36,6 @@ jobs:
       - name: Install Dependencies
         run: npm ci
 
-      - name: Lint JavaScript
-        run: npm run lint:js
-
-      - name: Run Unit Tests
-        run: npm run test
-
       - name: Compile JS and CSS
         run: |
           npm run compile:js
@@ -70,9 +66,8 @@ jobs:
           SANDBOX_HOST: ${{ vars.SANDBOX_HOST }}
         run: npm run run:sfcc-job
 
-  unit-tests:
+  unit-tests-and-lints:
     runs-on: ubuntu-latest
-    needs: build
     steps:
       - name: Checkout Code
         uses: actions/checkout@v3
@@ -88,7 +83,11 @@ jobs:
       - name: Run Unit Tests
         run: npm run test:unit
 
+      - name: Lint JavaScript
+        run: npm run lint:js
+
   index-tests:
+    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.base_ref == 'develop')
     runs-on: ubuntu-latest
     needs: build
     env:
@@ -134,6 +133,7 @@ jobs:
         run: npm run test:variationindex
 
   frontend-tests:
+    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.base_ref == 'develop')
     runs-on: ubuntu-latest
     needs: [build, index-tests]
     steps: