diff --git a/.travis.yml b/.travis.yml index 9ad645049..4f3a8ec42 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,8 +7,10 @@ git: branches: only: - develop - - "/^feature\\/.*$/" - - "/^fix\\/.*$/" + - master + - "/^feature\/.*$/" + - "/^feat\/.*$/" + - "/^fix\/.*$/" jobs: include: - stage: "Fundamental-react: Lint" @@ -20,3 +22,11 @@ notifications: email: on_failure: always on_success: change +before_deploy: +- bash ./ci-scripts/setup_npm.sh +deploy: + - provider: script + script: bash ./ci-scripts/publish.sh $TRAVIS_BRANCH $TRAVIS_BUILD_NUMBER + on: + branch: master + skip_cleanup: true \ No newline at end of file diff --git a/ci-scripts/publish.sh b/ci-scripts/publish.sh new file mode 100644 index 000000000..6d4c0a00e --- /dev/null +++ b/ci-scripts/publish.sh @@ -0,0 +1,23 @@ +#! /bin/bash +git config --global user.email "travis@travisci.org" +git config --global user.name "travis" + +git checkout master +npm install +npm run build + +# update the package verion and commit to the git repository +npm run std-version + +# pushes changes to master +git push --quiet --follow-tags "https://$GH_TOKEN@github.com/$TRAVIS_REPO_SLUG" "$TRAVIS_BRANCH" > /dev/null 2>&1; + +# commit changes made by standard-version to develop branch +git checkout develop +git merge master +git commit -a -m "chore: merge master into develop [ci skip]" +git push --quiet --follow-tags "https://$GH_TOKEN@github.com/$TRAVIS_REPO_SLUG" develop > /dev/null 2>&1; + +# publish master to npm +git checkout master +npm publish \ No newline at end of file diff --git a/ci-scripts/setup_npm.sh b/ci-scripts/setup_npm.sh new file mode 100644 index 000000000..16a996460 --- /dev/null +++ b/ci-scripts/setup_npm.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +set -o nounset +set -o errexit + +echo "//registry.npmjs.org/:username=${NPM_USERNAME}" >> ~/.npmrc +echo "//registry.npmjs.org/:email=${NPM_EMAIL}" >> ~/.npmrc +echo "//registry.npmjs.org/:_password=${NPM_PASSWORD}" > ~/.npmrc +echo "//registry.npmjs.org/:_authToken=${AUTH_TOKEN}" >> ~/.npmrc \ No newline at end of file diff --git a/package.json b/package.json index f905a31bd..4fa8436e3 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "predeploy": "npm run build", "start-js": "node scripts/start.js", "start": "node scripts/start.js", + "std-version": "standard-version -m \"chore(release): version %s build ${TRAVIS_BUILD_NUMBER} [ci skip]\"", "test:coverage": "jest --coverage", "test:dev": "jest", "test": "node scripts/test.js",