squash! Add a separate job for a PR

akirak · Nov 2, 2023 · fa3e25f · fa3e25f
1 parent 7e0299c
commit fa3e25f
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/.github/workflows/merge-upstream.yml b/.github/workflows/merge-upstream.yml
@@ -72,13 +72,14 @@ jobs:
     steps:
     - uses: actions/checkout@v3
       with:
-        ref: upstream-recipes
+        ref: akirak
+
+    - run: git merge --ff upstream-recipes
 
     - name: Create a pull request
       uses: peter-evans/create-pull-request@v5
       with:
-        base: akirak
-        branch: upstream-recipes
+        branch: create-pull-request/recipes
         token: ${{ secrets.PAT_FOR_PR }}
         title: 'Merge the upstream recipe commits'
         labels: automation