Skip to content
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.

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

[TIMOB-23926] Improve Ti SDK handling during CI builds #75

Merged
merged 3 commits into from Sep 20, 2016

Conversation

janvennemann
Copy link
Contributor

JIRA: https://jira.appcelerator.org/browse/TIMOB-23926

Makes sure the correct Ti SDK gets selected before starting the actual build and reselects the previous one after the build finishes.

@@ -132,26 +132,60 @@ function extract(filename, installLocation, keepFiles, callback) {
}

/**
<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like a merge-error. Please revisit the whole PR and retest ist before submitting to review.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Already addressed that but the push didn't make it due to github's infamous operation timeout. It's pushed now ;)

console.log(('Checking for updated Ti SDK from ' + branch).green);
var args = ['sdk', 'install', '-b', branch, '-d', '--no-banner'],
prc;
function installAndSelectLatestTiSDK(branch, next) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if I like different signatures between versions, but I guess you only have the 5_5_X check for this one release.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, the master build script is already different anyway as it now uses commander and allows selecting the branch which causes the different method signature. This makes it more flexible for future releases and i don't think we need to backport that to 1.2.X.

@hansemannn
Copy link
Contributor

Approved!

@hansemannn hansemannn merged commit b57e73c into tidev:master Sep 20, 2016
@janvennemann janvennemann deleted the TIMOB-23926 branch October 19, 2016 10:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants