5 Commits

Author SHA1 Message Date
89ce218b1c Merge pull request 'Actions: Update build branch name' (#13) from dev into main
All checks were successful
Build and Save Artifact / build (push) Successful in 13s
Reviewed-on: #13
2024-09-15 15:39:31 +00:00
0c4aec4886 Actions: Update build branch name
All checks were successful
Build and Save Artifact / build (pull_request) Successful in 13s
2024-09-15 17:38:36 +02:00
6dcb619b11 Merge pull request 'dev' (#12) from dev into main
All checks were successful
Build and Save Artifact / build (push) Successful in 12s
Reviewed-on: #12
2024-09-15 15:37:13 +00:00
6d5dd2125a Merge branch 'dev' of https://git.kozelkaricsi.hu/Cyanoure/NodeTest into dev
All checks were successful
Build and Save Artifact / build (pull_request) Successful in 14s
2024-09-15 17:35:50 +02:00
0d1725d93c Actions: build -> autobuild 2024-09-15 17:35:48 +02:00

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="autobuild/${SOURCE_BRANCH_NAME}"
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]"