ci: Just push, don't create a PR

akirak · Nov 4, 2023 · a6d9a9a · a6d9a9a
1 parent 35f0212
commit a6d9a9a
Showing 1 changed file with 3 additions and 11 deletions.
diff --git a/.github/workflows/merge-upstream.yml b/.github/workflows/merge-upstream.yml
@@ -18,9 +18,6 @@ jobs:
         upstream_branch:
           - 'master'
 
-    permissions:
-      contents: write
-
     steps:
 
     - uses: actions/checkout@v3
@@ -37,17 +34,12 @@ jobs:
     - name: Make a temporary branch
       run: |
         git switch -C tmp upstream/${{ matrix.upstream_branch }}
-        git push --force origin HEAD
-      env:
-        GITHUB_TOKEN: ${{ GITHUB_TOKEN }}
 
     - name: Cherry pick commits
       run: |
         git cherry-pick --strategy ort -X theirs ..${{ matrix.base_ref }}
 
-    - name: Create a pull request
-      uses: peter-evans/create-pull-request@v5
+    - name: Push changes
+      uses: ad-m/github-push-action@master
       with:
-        branch: My recipes
-        title: 'Rebase my branch onto the latest upstream'
-        labels: automation
+        force: true