forked from upstream-mirrors/quik
Fix duplicate Matrix forwarding, contact names and bridge reset
Build and Release APK / Build APK (push) Successful in 12m11s
Build and Release APK / Build APK (push) Successful in 12m11s
This commit is contained in:
@@ -13,6 +13,7 @@ jobs:
|
||||
- name: Checkout Repository
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
ref: master
|
||||
fetch-depth: 0
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
@@ -23,12 +24,11 @@ jobs:
|
||||
|
||||
- name: Fetch and Merge Upstream
|
||||
run: |
|
||||
git remote add upstream https://gitea.labus.uk/upstream-mirrors/quik.git
|
||||
git fetch upstream
|
||||
git fetch https://gitea.labus.uk/upstream-mirrors/quik.git master
|
||||
# Try to merge upstream master into our master branch.
|
||||
# If it fails, the step exits with a non-zero code.
|
||||
git merge upstream/master --no-edit
|
||||
git push origin master
|
||||
git merge FETCH_HEAD --no-edit
|
||||
git push origin HEAD:master
|
||||
|
||||
- name: Notify on Failure
|
||||
if: failure()
|
||||
|
||||
Reference in New Issue
Block a user