ci: Create a PR with in a single job

akirak · Nov 3, 2023 · f62efa9 · f62efa9
1 parent 298b7ff
commit f62efa9
Showing 1 changed file with 5 additions and 16 deletions.
diff --git a/.github/workflows/merge-upstream.yml b/.github/workflows/merge-upstream.yml
@@ -10,7 +10,7 @@ on:
       - '.github/workflows/merge-upstream.yml'
 
 jobs:
-  push:
+  pr:
     runs-on: ubuntu-latest
 
     strategy:
@@ -69,21 +69,10 @@ jobs:
       run: |
         git rebase -s ort -X ours ${{ steps.start.outputs.rev }}
 
-    - run: git push --force-with-lease origin HEAD
-
-  pr:
-    runs-on: ubuntu-latest
-
-    needs:
-    - push
-
-    steps:
-    - uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-        ref: akirak
-
-    - run: git merge --ff origin/upstream-recipes
+    - name: Merge into the original branch
+      run: |
+        git switch -c  ${{ strategy.base_ref }}
+        git merge --ff upstream-recipes
 
     - name: Create a pull request
       uses: peter-evans/create-pull-request@v5