From 8bd12a5a57cb247a49be79b0fb93a9f7e2ac0b50 Mon Sep 17 00:00:00 2001 From: Sumedha Pramod Date: Thu, 9 Nov 2017 16:25:59 -0800 Subject: [PATCH] Fix: release script should use correct remote branch (#20) * Fix: release script to use correct remote branch * Chore: Adding separate step for publishing package to npm --- build/release.sh | 10 +++++----- package.json | 7 ++++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/build/release.sh b/build/release.sh index 916bb07a7..c92ba3463 100755 --- a/build/release.sh +++ b/build/release.sh @@ -21,18 +21,18 @@ reset_to_master() { git tag -l | xargs git tag -d || return 1 # Add the origin remote if it is not present - if ! git remote get-url github-origin; then - git remote add github-origin git@github.com:box/box-annotations.git || return 1 + if ! git remote get-url release; then + git remote add release git@github.com:box/box-annotations.git || return 1 fi # Fetch latest code with tags - git fetch --tags github-origin || return 1; + git fetch --tags release || return 1; # Reset to latest code and clear unstashed changes - git reset --hard github-origin/master || return 1 + git reset --hard release/master || return 1 # Remove old local tags in case a build failed - git fetch --prune github-upstream '+refs/tags/*:refs/tags/*' || exit 1 + git fetch --prune release '+refs/tags/*:refs/tags/*' || exit 1 git clean -fdX || return 1 } diff --git a/package.json b/package.json index e0024f250..e4a329ab3 100644 --- a/package.json +++ b/package.json @@ -105,9 +105,10 @@ "github-release": "./node_modules/.bin/conventional-github-releaser", "changelog": "./node_modules/.bin/conventional-changelog -i CHANGELOG.md --same-file", "release": "yarn run clean && yarn run lint && yarn run test && yarn run prod", - "minor": "./build/release.sh -n && ./build/publish.sh", - "major": "./build/release.sh -m && ./build/publish.sh", - "patch": "./build/release.sh -p && ./build/publish.sh" + "publish": "./build/publish.sh", + "minor": "./build/release.sh -n && yarn run publish", + "major": "./build/release.sh -m && yarn run publish", + "patch": "./build/release.sh -p && yarn run publish" }, "lint-staged": { "src/**/*.js": [