Skip to content

Commit 0059d37

Browse files
committed
Reset cdrci aur repo when publishing
I figure it is probably faster to keep it up to date than to merge larger and larger changes each time?
1 parent 58aedd0 commit 0059d37

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

.github/workflows/publish.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,12 @@ jobs:
7070
token: ${{ secrets.HOMEBREW_GITHUB_API_TOKEN }}
7171
ref: "master"
7272

73-
- name: Merge in master
73+
- name: Fetch and reset master
7474
run: |
7575
git remote add upstream https://github.com/coder/code-server-aur.git
7676
git fetch upstream
77-
git merge upstream/master
77+
git reset --hard upstream/master
78+
git push --force
7879
7980
- name: Configure git
8081
run: |

0 commit comments

Comments
 (0)