Skip to content

tidy release script & compute tests #1256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
callmehiphop merged 1 commit into from
Apr 22, 2016
Merged

tidy release script & compute tests #1256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/compute/autoscaler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,15 +168,15 @@ nodeutil.inherits(Autoscaler, ServiceObject);
Autoscaler.prototype.delete = function(callback) {
callback = callback || util.noop;

var compute = this.zone.compute;
var zone = this.zone;

ServiceObject.prototype.delete.call(this, function(err, resp) {
if (err) {
callback(err, null, resp);
return;
}

var operation = compute.operation(resp.name);
var operation = zone.operation(resp.name);
operation.metadata = resp;

callback(null, operation, resp);
Expand Down Expand Up @@ -228,7 +228,7 @@ Autoscaler.prototype.setMetadata = function(metadata, callback) {
return;
}

var operation = zone.compute.operation(resp.name);
var operation = zone.operation(resp.name);
operation.metadata = resp;

callback(null, operation, resp);
Expand Down
2 changes: 1 addition & 1 deletion scripts/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ if [ "${TRAVIS_BRANCH}" == "master" ] && [ "${TRAVIS_PULL_REQUEST}" == "false" ]
# commit to gh-pages branch to apply changes
git config user.name "travis-ci"
git config user.email "[email protected]"
git commit -m "Update docs after merge to master"
git commit -m "Update docs after merge to master [ci skip]"
git status
git push https://${GH_OAUTH_TOKEN}@github.com/${GH_OWNER}/${GH_PROJECT_NAME} HEAD:gh-pages
else
Expand Down
10 changes: 7 additions & 3 deletions scripts/release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,21 @@ openssl aes-256-cbc -K $encrypted_b8aa0887832a_key -iv $encrypted_b8aa0887832a_i
npm run docs
npm run system-test

git config user.name "travis-ci"
git config user.email "[email protected]"
git config --global user.name "travis-ci"
git config --global user.email "[email protected]"

## Attempt to update docs/manifest.json with the new version.
git checkout master
node -e "
file = require('./docs/manifest.json')
if (file.versions.indexOf('${TRAVIS_TAG}') === -1) file.versions.unshift('${TRAVIS_TAG}')
require('fs').writeFileSync('docs/manifest.json', JSON.stringify(file, null, 2) + '\n')
"
# allow "git add" to fail if there aren't new files.
set +e
git add docs/manifest.json
git commit -m "Update docs/manifest.json for ${TRAVIS_TAG}"
set -e
git commit -m "Update docs/manifest.json for ${TRAVIS_TAG} [ci skip]"
git status
if [[ -n "$(git status --porcelain)" ]]; then
git push https://${GH_OAUTH_TOKEN}@github.com/${GH_OWNER}/${GH_PROJECT_NAME} HEAD:master
Expand Down
Loading