dev #12

Merged
Cyanoure merged 2 commits from dev into main 2024-09-15 15:37:13 +00:00
Showing only changes of commit 0d1725d93c - Show all commits

View File

@ -36,7 +36,7 @@ jobs:
git config --global user.email 'noreply@kozelkaricsi.hu' git config --global user.email 'noreply@kozelkaricsi.hu'
git fetch origin git fetch origin
git checkout ${SOURCE_BRANCH_NAME} git checkout ${SOURCE_BRANCH_NAME}
BRANCH_NAME="${SOURCE_BRANCH_NAME}-build" BRANCH_NAME="${SOURCE_BRANCH_NAME}-autobuild"
git fetch origin $BRANCH_NAME --unshallow || true # Allow failure if branch doesn't exist git fetch origin $BRANCH_NAME --unshallow || true # Allow failure if branch doesn't exist
git switch $BRANCH_NAME || git switch -c $BRANCH_NAME git switch $BRANCH_NAME || git switch -c $BRANCH_NAME
git merge ${SOURCE_BRANCH_NAME} -m "Update branch [skip ci]" git merge ${SOURCE_BRANCH_NAME} -m "Update branch [skip ci]"