aaron/nextcloud-docker
0
0
Fork 0
mirror of https://github.com/nextcloud/docker.git synced 2025-03-15 19:05:09 +01:00
Code Activity

make update_fork workflow work with branches of forks (will still sync with main branch of upstream)

Browse source
This commit is contained in:
dan-mm 2023-07-27 15:11:34 +02:00
parent ed7ce88a53
commit aa7273477e
No known key found for this signature in database
GPG key ID: FD9621805FDDF084
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/update_fork.yml vendored
View file

@ -31,7 +31,7 @@ jobs:
CHANGES=$(git rev-list HEAD..upstream/master --count) CHANGES=$(git rev-list HEAD..upstream/master --count)
if [ "$CHANGES" -gt 0 ]; then if [ "$CHANGES" -gt 0 ]; then
echo "Updating fork..." echo "Updating fork..."
git checkout master git checkout ${{ github.ref_name }}
git merge upstream/master git merge upstream/master
git push git push
else else