squash! Don't use the Nix flake

akirak · Nov 2, 2023 · 63fcd6c · 63fcd6c
1 parent 040d495
commit 63fcd6c
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/.github/workflows/merge-upstream.yml b/.github/workflows/merge-upstream.yml
@@ -59,16 +59,20 @@ jobs:
             commit.committer_date = commit.author_date
           ' --force
 
+    - name: Rebase
+      run: |
+        git rebase -s ours --onto=merge-base ${{ steps.start.outputs.rev }}
+
     # A workaround to prevent peter-evans/create-pull-request from resetting the
     # head here:
     # <https://github.com/peter-evans/create-pull-request/blob/d806186ee3288c60a352af9852b6b18afbbfd87e/src/create-or-update-branch.ts#L178>
-    - name: Detach the head
-      run: git switch --detach `git rev-parse HEAD`
+    # - name: Detach the head
+    #   run: git switch --detach `git rev-parse HEAD`
 
     - name: Create a pull request
       uses: peter-evans/create-pull-request@v5
       with:
-        base: merge-base
+        # base: merge-base
         token: ${{ secrets.PAT_FOR_PR }}
         title: 'Merge the upstream recipe commits'
         branch: upstream-recipes