Skip to content

Commit

Permalink
CI: Update update_master.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
tsi authored Mar 17, 2024
1 parent 064e4fc commit e53507d
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/update_master.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 🏹 Update Master
name: 🏹 Update Master (PR)

on:
workflow_dispatch:
Expand All @@ -8,11 +8,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
ref: master

- run: git checkout master

- name: Merge edge into master
run: git merge -X ours --no-edit origin/edge
run: git merge -X ours --no-edit edge

- name: Create Pull Request
uses: peter-evans/create-pull-request@v6
Expand Down

0 comments on commit e53507d

Please sign in to comment.