diff --git a/scripts/release-perform.sh b/scripts/release-perform.sh index e8f5b70d3..d8c5164da 100755 --- a/scripts/release-perform.sh +++ b/scripts/release-perform.sh @@ -47,6 +47,6 @@ git add CHANGELOG.md git commit -m "Update CHANGELOG.md" git push origin $CURRENT_BRANCH -echo -e "From now checks that all is ok on ${CYAN}http://$CURRENT_BRANCH.pix.beta.gouv.fr${RESET_COLOR} environment and then execute ${CYAN}release:publish${RESET_COLOR} NPM task. If you need to update CHANGELOG.md file, then edit it and run ${CYAN}release:perform${RESET_COLOR} NPM task again.\n" +echo -e "If the CHANGELOG.md file is ok, then execute ${CYAN}release:publish${RESET_COLOR} NPM task. If you need to update the CHANGELOG.md file, then edit it and run ${CYAN}release:perform${RESET_COLOR} NPM task again.\n" echo -e "Release performing ${GREEN}succeeded${RESET_COLOR}." diff --git a/scripts/release-prepare.sh b/scripts/release-prepare.sh index 21412c2cb..7a5f3f619 100755 --- a/scripts/release-prepare.sh +++ b/scripts/release-prepare.sh @@ -43,7 +43,7 @@ then fi # Fetches all last changes -git fetch --all +git pull # Remove local branch 'release' if exists, then create it RELEASE_BRANCH="release-$PACKAGE_VERSION" diff --git a/scripts/release-publish.sh b/scripts/release-publish.sh index fdfcd673a..4a5e260ca 100755 --- a/scripts/release-publish.sh +++ b/scripts/release-publish.sh @@ -49,7 +49,7 @@ git push origin dev echo -e "You are now on branch ${YELLOW}dev${RESET_COLOR}.\n" # Fetches all last changes -git fetch --all +git pull git checkout master echo -e "You are now on branch ${YELLOW}master${RESET_COLOR}.\n"