mirror of https://github.com/coder/code-server.git
fix: merge in master from coder/code-server-aur (#5730)
This ensures that the branch is up-to-date with coder/code-server-aur before opening a PR.
This commit is contained in:
parent
649985af8e
commit
7c0c0b0c29
|
@ -97,6 +97,12 @@ jobs:
|
|||
token: ${{ secrets.HOMEBREW_GITHUB_API_TOKEN }}
|
||||
ref: "master"
|
||||
|
||||
- name: Merge in master
|
||||
run: |
|
||||
git remote add upstream https://github.com/coder/code-server-aur.git
|
||||
git fetch upstream
|
||||
git merge upstream/master
|
||||
|
||||
- name: Configure git
|
||||
run: |
|
||||
git config --global user.name cdrci
|
||||
|
|
Loading…
Reference in New Issue