From 969e87eff02f802b044f107fac88a89ca8627a43 Mon Sep 17 00:00:00 2001 From: rschamp Date: Fri, 9 Oct 2020 16:58:11 -0400 Subject: [PATCH 1/6] Allow hotfixing by pushing to hotfix/* Also push tags when we deploy to npm --- .travis.yml | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index a9695414..a59ecfbc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,8 @@ node_js: env: global: - NODE_ENV=production + - NPM_TAG=latest + - RELEASE_TIMESTAMP="$(date +'%Y%m%d%H%M%S')" matrix: - NPM_SCRIPT="unit" cache: @@ -21,9 +23,18 @@ jobs: - stage: release env: NPM_SCRIPT=build before_deploy: - - npm --no-git-tag-version version 0.2.0-prerelease.$(date +%Y%m%d%H%M%S) - - git config --global user.email $(git log --pretty=format:"%ae" -n1) - - git config --global user.name $(git log --pretty=format:"%an" -n1) + - > + if [ -z "$BEFORE_DEPLOY_RAN" ]; then + VPKG=$($(npm bin)/json -f package.json version) + export RELEASE_VERSION=${VPKG}-prerelease.${RELEASE_TIMESTAMP} + npm --no-git-tag-version version $RELEASE_VERSION + if [[ "$TRAVIS_BRANCH" == hotfix/* ]]; then # double brackets are important for matching the wildcard + export NPM_TAG=hotfix + fi + git config --global user.email "$(git log --pretty=format:"%ae" -n1)" + git config --global user.name "$(git log --pretty=format:"%an" -n1)" + export BEFORE_DEPLOY_RAN=true + fi deploy: - provider: script on: @@ -39,17 +50,30 @@ jobs: script: npm run --silent deploy -- -x -a -r https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git - provider: npm on: - branch: develop + branch: + - master + - develop + - hotfix/* condition: $TRAVIS_EVENT_TYPE != cron skip_cleanup: true email: $NPM_EMAIL api_key: $NPM_TOKEN + tag: $NPM_TAG - provider: script on: - branch: develop - condition: $TRAVIS_EVENT_TYPE == cron + branch: + - master + - develop + - hotfix/* + condition: $TRAVIS_EVENT_TYPE != cron skip_cleanup: true - script: npm run i18n:src && npm run i18n:push + script: if npm info | grep -q $RELEASE_VERSION; then git tag $RELEASE_VERSION && git push https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git $RELEASE_VERSION; fi + - provider: script + on: + branch: develop + condition: $TRAVIS_EVENT_TYPE == cron + skip_cleanup: true + script: npm run i18n:src && npm run i18n:push stages: - test - name: release From 3662209ffa02d77b6a38b98c356cfdccfdb1bd2f Mon Sep 17 00:00:00 2001 From: rschamp Date: Fri, 9 Oct 2020 17:13:46 -0400 Subject: [PATCH 2/6] Adjust condition for release stage --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a59ecfbc..cec43b8e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ jobs: include: - env: NPM_SCRIPT=lint - env: NPM_SCRIPT=build - if: not (branch in (master, develop) and type != pull_request) + if: not (type != pull_request AND (branch =~ /^(develop|master|hotfix\/)/)) - stage: release env: NPM_SCRIPT=build before_deploy: @@ -77,4 +77,4 @@ jobs: stages: - test - name: release - if: branch in (master, develop) and type != pull_request + if: type != pull_request AND (branch =~ /^(develop|master|hotfix\/)/) From c3282e892277d8d6c7a0c034779ba629a83cfa50 Mon Sep 17 00:00:00 2001 From: rschamp Date: Fri, 9 Oct 2020 17:31:56 -0400 Subject: [PATCH 3/6] Install json dependency --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index f5b9716e..b73a5a20 100644 --- a/package.json +++ b/package.json @@ -69,6 +69,7 @@ "html-webpack-plugin": "3.2.0", "jest": "^22.2.2", "jest-canvas-mock": "^2.2.0", + "json": "^9.0.6", "lodash.defaultsdeep": "4.6.1", "mkdirp": "^1.0.3", "postcss-import": "^12.0.0", From 6fd0a19cd6256a24a2b049502dbda36d577a0611 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 15 Oct 2020 21:27:02 +0000 Subject: [PATCH 4/6] Bump scratch-svg-renderer Bumps [scratch-svg-renderer](https://github.com/LLK/scratch-svg-renderer) from 0.2.0-prerelease.20200610220938 to 0.2.0-prerelease.20201015194358. - [Release notes](https://github.com/LLK/scratch-svg-renderer/releases) - [Commits](https://github.com/LLK/scratch-svg-renderer/commits/0.2.0-prerelease.20201015194358) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f5b9716e..51cb8dad 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "minilog": "3.1.0", "parse-color": "1.0.0", "prop-types": "^15.5.10", - "scratch-svg-renderer": "0.2.0-prerelease.20200610220938" + "scratch-svg-renderer": "0.2.0-prerelease.20201015194358" }, "peerDependencies": { "react": "^16", From 32135ae9389c6b54557c6e20c7f034dd30a743e6 Mon Sep 17 00:00:00 2001 From: picklesrus Date: Fri, 16 Oct 2020 13:06:02 -0400 Subject: [PATCH 5/6] Bump scratch-svg-renderer --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index eb9f366f..d7fc42ac 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "minilog": "3.1.0", "parse-color": "1.0.0", "prop-types": "^15.5.10", - "scratch-svg-renderer": "0.2.0-prerelease.20201015194358" + "scratch-svg-renderer": "0.2.0-prerelease.20201016121710" }, "peerDependencies": { "react": "^16", From 45238608bb3fd63767c30ecb9887fe98fecb1cef Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 20 Oct 2020 02:49:07 +0000 Subject: [PATCH 6/6] Bump scratch-svg-renderer Bumps [scratch-svg-renderer](https://github.com/LLK/scratch-svg-renderer) from 0.2.0-prerelease.20201016121710 to 0.2.0-prerelease.20201019174008. - [Release notes](https://github.com/LLK/scratch-svg-renderer/releases) - [Commits](https://github.com/LLK/scratch-svg-renderer/commits/0.2.0-prerelease.20201019174008) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d7fc42ac..d802624c 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "minilog": "3.1.0", "parse-color": "1.0.0", "prop-types": "^15.5.10", - "scratch-svg-renderer": "0.2.0-prerelease.20201016121710" + "scratch-svg-renderer": "0.2.0-prerelease.20201019174008" }, "peerDependencies": { "react": "^16",