[AAE-2570] prepare script to change name development to develop (#5675)

* prepare script to change name development to develop

* travis for develop
This commit is contained in:
Eugenio Romano
2020-05-06 11:23:01 +01:00
committed by GitHub
parent 94e2e83e73
commit e139b4c218
6 changed files with 12 additions and 12 deletions

View File

@@ -13,7 +13,7 @@ install:
branches: branches:
only: only:
- master - master
- development - develop
- /.*old-env.*/ - /.*old-env.*/
- /.*next-release.*/ - /.*next-release.*/
- /.*beta.*/ - /.*beta.*/
@@ -38,7 +38,7 @@ stages:
- name: Release beta tag - name: Release beta tag
if: type = cron OR branch = master if: type = cron OR branch = master
- name: Trigger ADF child build - name: Trigger ADF child build
if: (branch = development AND type = push) OR type = api if: (branch = develop AND type = push) OR type = api
addons: addons:
chrome: stable chrome: stable
@@ -62,7 +62,7 @@ jobs:
- ./scripts/travis/build/build.sh || exit 1; - ./scripts/travis/build/build.sh || exit 1;
- ./scripts/lint.sh || exit 1; - ./scripts/lint.sh || exit 1;
# Run Only on Development and master # Run Only on develop and master
- stage: Lint & Build Dist & Release - stage: Lint & Build Dist & Release
name: Lint & Build Dist & Release name: Lint & Build Dist & Release
script: script:

View File

@@ -25,8 +25,8 @@ then
exit 0 exit 0
fi fi
hash1=$(git show-ref --heads -s development) hash1=$(git show-ref --heads -s develop)
hash2=$(git merge-base development $BRANCH_NAME) hash2=$(git merge-base develop $BRANCH_NAME)
[ "${hash1}" = "${hash2}" ] && echo "Branch up to date" || { echo "Branch needs to be rebeased"; exit 1; } [ "${hash1}" = "${hash2}" ] && echo "Branch up to date" || { echo "Branch needs to be rebeased"; exit 1; }
echo "Development branch HEAD sha " $hash1 echo "Development branch HEAD sha " $hash1

View File

@@ -30,7 +30,7 @@ release() {
rm -rf $TEMP; rm -rf $TEMP;
git clone https://$TOKEN@github.com/$1.git $TEMP git clone https://$TOKEN@github.com/$1.git $TEMP
cd $TEMP cd $TEMP
git checkout development git checkout develop
if $GNU; then if $GNU; then
./node_modules/@alfresco/adf-cli/bin/adf-cli update-version --pathPackage "$(pwd)" --version $VERSION ./node_modules/@alfresco/adf-cli/bin/adf-cli update-version --pathPackage "$(pwd)" --version $VERSION
@@ -40,9 +40,9 @@ release() {
git add . git add .
git commit -m "Release $VERSION" git commit -m "Release $VERSION"
git push -u origin development git push -u origin develop
curl -H "Authorization: token $TOKEN" -X POST -d '{"body":"Release ADF version '$VERSION'","head":"'development'","base":"master","title":"Release ADF version '$VERSION'"}' https://api.github.com/repos/$1/pulls curl -H "Authorization: token $TOKEN" -X POST -d '{"body":"Release ADF version '$VERSION'","head":"'develop'","base":"master","title":"Release ADF version '$VERSION'"}' https://api.github.com/repos/$1/pulls
rm -rf $TEMP; rm -rf $TEMP;
} }

View File

@@ -11,7 +11,7 @@ npm install @alfresco/adf-cli@alpha
if [[ $TRAVIS_PULL_REQUEST == "false" ]]; if [[ $TRAVIS_PULL_REQUEST == "false" ]];
then then
if [[ $TRAVIS_BRANCH == "development" ]]; if [[ $TRAVIS_BRANCH == "develop" ]];
then then
NEXT_VERSION=-nextalpha NEXT_VERSION=-nextalpha
if [[ $TRAVIS_EVENT_TYPE == "cron" ]]; if [[ $TRAVIS_EVENT_TYPE == "cron" ]];

View File

@@ -7,7 +7,7 @@ cd $DIR/../../../
if [[ $TRAVIS_PULL_REQUEST == "false" ]]; if [[ $TRAVIS_PULL_REQUEST == "false" ]];
then then
TAG_NPM=latest TAG_NPM=latest
if [[ $TRAVIS_BRANCH == "development" ]]; if [[ $TRAVIS_BRANCH == "develop" ]];
then then
TAG_NPM=alpha TAG_NPM=alpha
if [[ $TRAVIS_EVENT_TYPE == "cron" ]]; if [[ $TRAVIS_EVENT_TYPE == "cron" ]];

View File

@@ -45,7 +45,7 @@ rm -rf $TEMP_GENERATOR_DIR;
git clone https://$TOKEN@github.com/$NAME_REPO.git $TEMP_GENERATOR_DIR git clone https://$TOKEN@github.com/$NAME_REPO.git $TEMP_GENERATOR_DIR
cd $TEMP_GENERATOR_DIR cd $TEMP_GENERATOR_DIR
git checkout development git checkout develop
BRANCH="ADF-update-$VERSION" BRANCH="ADF-update-$VERSION"
git checkout -b $BRANCH git checkout -b $BRANCH
@@ -56,6 +56,6 @@ git add .
git commit -m "Update ADF packages version $VERSION" git commit -m "Update ADF packages version $VERSION"
git push -u origin $BRANCH git push -u origin $BRANCH
curl -H "Authorization: token $TOKEN" -X POST -d '{"body":"Update ADF packages version '$VERSION'","head":"'$BRANCH'","base":"development","title":"Update ADF packages version '$VERSION'"}' https://api.github.com/repos/$NAME_REPO/pulls curl -H "Authorization: token $TOKEN" -X POST -d '{"body":"Update ADF packages version '$VERSION'","head":"'$BRANCH'","base":"develop","title":"Update ADF packages version '$VERSION'"}' https://api.github.com/repos/$NAME_REPO/pulls
rm -rf $TEMP_GENERATOR_DIR; rm -rf $TEMP_GENERATOR_DIR;