From af8afa08112ac23ee22ce27cf017306cce951193 Mon Sep 17 00:00:00 2001 From: Mario Vitale Date: Fri, 24 Nov 2023 20:23:54 +0100 Subject: [PATCH] Fix branch naming --- scripts/bump_build_number.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/bump_build_number.sh b/scripts/bump_build_number.sh index 0c3e6b7ee23..7252c5487d9 100755 --- a/scripts/bump_build_number.sh +++ b/scripts/bump_build_number.sh @@ -10,14 +10,14 @@ if ! git diff --quiet; then exit 1 fi -log "Saving currently checked out branch" +log "Saving the currently checked out branch" CURRENT_BRANCH=$(git branch --show-current) trap "git checkout $CURRENT_BRANCH" EXIT : ${BRANCH_TO_BUILD:=main} -: ${GIT_LOCAL_BRANCH:=bump-build} LATEST_BUILD_NUMBER=$(./scripts/get_latest_build_number.sh) BUILD_NUMBER=$(($LATEST_BUILD_NUMBER + 1)) +GIT_LOCAL_BRANCH=bump-build-${BRANCH_TO_BUILD}-${BUILD_NUMBER} log "Build number to use for the beta build: $BUILD_NUMBER" log "Creating branch '${GIT_LOCAL_BRANCH}' based on branch '$BRANCH_TO_BUILD'" @@ -34,8 +34,9 @@ export BRANCH_TO_BUILD=${BRANCH_TO_BUILD} export GIT_LOCAL_BRANCH=${GIT_LOCAL_BRANCH} EOF -log "Running the fastlane branch generation script" -(set -xa && . .env && cd fastlane && bundle exec fastlane set_app_build_number) +log "Running the fastlane build number bumper script" +(. .env && cd fastlane && bundle exec fastlane set_app_build_number) -# TODO implement +# TODO push the ${GIT_LOCAL_BRANCH} branch, and create a PR for it +# TODO put the core-build-engineers as PR reviewers git branch -l -a