Skip to content

Commit

Permalink
Bump iothub-explorer version and fix npm release script
Browse files Browse the repository at this point in the history
  • Loading branch information
Pierre Cauchois committed Jul 30, 2016
1 parent f7a827e commit 1e8f6fd
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion build/release/bump_version/versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"c_shared_utility_nuget": "1.0.14",
"uamqp_c_nuget": "1.0.15",
"umqtt_c_nuget": "1.0.14",
"iothub-explorer": "1.0.9",
"iothub-explorer": "1.0.10",
"device-explorer": "1.0.9",
"github-release": "v1.0.7"
}
20 changes: 10 additions & 10 deletions build/release/release_npm/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ function getRepoRoot() {
});
}

function ensureCurrentBranchIsDevelop() {
return u.isCurrentBranch('develop')
.then(function (isDevelop) {
return isDevelop ?
function ensureCurrentBranchIsMaster() {
return u.isCurrentBranch('master')
.then(function (isMaster) {
return isMaster ?
null :
Promise.reject(new Error('Please switch to the \'develop\' branch before running this script.'));
Promise.reject(new Error('Please switch to the \'master\' branch before running this script.'));
});
}

Expand Down Expand Up @@ -165,9 +165,9 @@ function getTarballUrl(pkg) {
return u.getTarballUrl(remoteName, pkg.stagingBranch());
}

function checkoutDevelop() {
console.log('\nReturning to branch \'develop\'...');
return u.checkoutBranch('develop');
function checkoutMaster() {
console.log('\nReturning to branch \'master\'...');
return u.checkoutBranch('master');
}

function deleteStagingBranches() {
Expand All @@ -182,7 +182,7 @@ function deleteStagingBranches() {
}

function cleanup() {
return checkoutDevelop()
return checkoutMaster()
.then(deleteStagingBranches);
}

Expand All @@ -204,7 +204,7 @@ if (process.argv.length < 4) {
}

getRepoRoot()
.then(ensureCurrentBranchIsDevelop)
.then(ensureCurrentBranchIsMaster)
.then(ensureThereAreNoUncommittedChanges)
.then(ensureWorkingDirectoryIsClean)
.then(ensureRepoIsTrackingTheGivenRemote)
Expand Down
2 changes: 1 addition & 1 deletion tools/iothub-explorer/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "iothub-explorer",
"version": "1.0.9",
"version": "1.0.10",
"description": "Azure IoT Hub Explorer",
"author": "Microsoft Corporation",
"license": "MIT",
Expand Down

0 comments on commit 1e8f6fd

Please sign in to comment.