feat(ci): Running merge-aware tests on a pull request without actuall…

…y merging
nikitosikvn1 · Jun 5, 2023 · fd8f806 · fd8f806
1 parent 58d265a
commit fd8f806
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/.github/workflows/django-test.yml b/.github/workflows/django-test.yml
@@ -2,9 +2,12 @@ name: Django CI
 
 on:
   push:
-    branches: [ dev ]
+    branches:
+      - dev 
   pull_request:
-    branches: [ main ]
+    branches:
+      - dev
+      - main
 
 jobs:
   build-and-test:
@@ -20,6 +23,13 @@ jobs:
     steps:
       - name: Check out repository code
         uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Merge base branch 'dev'
+        run: |
+          git fetch origin dev:dev
+          git merge dev
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1