Try to merge base in a PR

ximinez · Jun 30, 2023 · c229a71 · c229a71
1 parent 6b7233c
commit c229a71
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -20,6 +20,19 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@v3
+        with:
+          fetch-depth: 50
+      - name: merge with base
+        if: github.base_ref != ''
+        shell: bash
+        run: |
+          # If there are any conflicts, leave them, so the build will
+          # fail. However, Github will probably prevent the job from
+          # running at all.
+          git log --oneline
+          git merge --no-commit --no-edit -v \
+            ${{ github.event.pull_request.base.sha }}
+          git diff || true
       - name: install Ninja
         if: matrix.generator == 'Ninja'
         run: brew install ninja

diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
@@ -100,6 +100,19 @@ jobs:
           ls ~/.conan
       - name: checkout
         uses: actions/checkout@v3
+        with:
+          fetch-depth: 50
+      - name: merge with base
+        if: github.base_ref != ''
+        shell: bash
+        run: |
+          # If there are any conflicts, leave them, so the build will
+          # fail. However, Github will probably prevent the job from
+          # running at all.
+          git log --oneline
+          git merge --no-commit --no-edit -v \
+            ${{ github.event.pull_request.base.sha }}
+          git diff || true
       - name: build
         uses: ./.github/actions/build
         with: