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.

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

Jump to bottom

[TIMOB-23926] Improve Ti SDK handling during CI builds (1.2.X) #76

Merged
merged 3 commits into from
Sep 20, 2016
Merged

[TIMOB-23926] Improve Ti SDK handling during CI builds (1.2.X) #76

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc10f7f
[TIMOB-23926] Migrate tests to Swift 3.0
janvennemann Sep 19, 2016
1537544
[TIMOB-23926] Install and select matching Ti SDK during build
janvennemann Sep 19, 2016
c04cbce
[TIMOB-23926] Move Ti SDK branch variable to the top
janvennemann Sep 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions iphone/hyperloop.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@
};
2461FD9A1BB0C286006D4D9E = {
CreatedOnToolsVersion = 7.0;
LastSwiftMigration = 0800;
};
};
};
Expand Down Expand Up @@ -424,6 +425,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "tests/Tests-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
};
name = Debug;
};
Expand All @@ -436,6 +438,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.appcelerator.hyperloop.tests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "tests/Tests-Bridging-Header.h";
SWIFT_VERSION = 3.0;
};
name = Release;
};
Expand Down
6 changes: 3 additions & 3 deletions iphone/tests/TestView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import Foundation
import UIKit


public class TestView : UIView {
open class TestView : UIView {

public func foo (x : CGFloat, y : CGFloat) -> CGFloat {
open func foo (_ x : CGFloat, y : CGFloat) -> CGFloat {
return x + y;
}
}
}
86 changes: 72 additions & 14 deletions tools/ci.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,23 +130,62 @@ function extract(filename, installLocation, keepFiles, callback) {
});
}

// Install 5_4_X branch Titanium SDK
function installSDK(next) {
console.log('Checking for updated Ti SDK from 5_4_X'.green);
var args = ['sdk', 'install', '-b', '5_4_X', '-d', '--no-banner'],
prc;
/**
* Installs latest Ti SDK required by the Hyperloop version we are about to build
*
* @param {Function} next
*/
function installAndSelectLatestTiSDK(next) {
var hyperloopVersion = require(path.join(__dirname, '..', 'package.json')).version;
var tiSDKBranch = '5_5_X';
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we move this to the top of the file to keep it clear. That's all, we can merge afterwards.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Addressed!

var isUpToDate = false;
var installedVersion;
console.log(('Checking for updated Ti SDK from ' + tiSDKBranch + ' branch.').green);
var args = ['sdk', 'install', '-b', tiSDKBranch, '-d', '--no-banner'];
if (process.argv.indexOf('--no-progress-bars') != -1) {
args.push('--no-progress-bars');
}
prc = spawn(titanium, args, {stdio:'inherit'});
prc.on('exit', function (code) {
var child = spawn(titanium, args);
child.stdout.on('data', function(buffer) {
var message = buffer.toString();
if (message.indexOf('You\'re up-to-date') !== -1) {
isUpToDate = true;
versionMatch = message.match(/Version\s([\d\.v]+)/);
installedVersion = versionMatch[1];
}
});
child.on('exit', function (code) {
if (code !== 0) {
next("Failed to install 5_4_X SDK. Exit code: " + code);
next('Failed to install latest ' + tiSDKBranch + ' SDK. Exit code: ' + code);
} else {
if (isUpToDate && installedVersion) {
console.log('Latest version ' + installedVersion + ' already installed, select it!');
return selectTiSDKVersion(installedVersion, next);
}
console.log('Installed and selected latest Ti SDK build from branch ' + tiSDKBranch + '.');
next();
}
});
prc.on('error', next);
child.on('error', next);
}

/**
* Selects a specific Ti SDK version
*
* @param {String} version The version to select
* @param {Function} next
*/
function selectTiSDKVersion(version, next) {
var child = spawn(titanium, ['sdk', 'select', version, '--no-banner']);
child.on('exit', function (code) {
if (code !== 0) {
next(new Error('Failed to select SDK ' + version + '. Exit code: ' + code));
} else {
console.log('Selected Ti SDK ' + version);
next();
}
});
child.on('error', next);
}

// Grab the Android home location
Expand Down Expand Up @@ -359,7 +398,8 @@ function writeAndroidPluginPackage (next) {
function build(callback) {
var tiSDKPath,
androidSDKPath,
androidNDKPath;
androidNDKPath,
preBuildSelectedTiSDKVersion;

// set the environment variable CI during build
process.env.CI = 1;
Expand All @@ -372,11 +412,22 @@ function build(callback) {
wrench.mkdirSyncRecursive(buildTempDir);
next();
},
// Install latest Titanium SDK from 5_4_X
installSDK,
// Install latest Titanium SDK
function (next) {
async.waterfall([
tiver.getActivePath,
function savePreviouslySelectedTiSDKVersion(sdkPath, version, callback) {
preBuildSelectedTiSDKVersion = version;
callback();
},
installAndSelectLatestTiSDK
], function(err) {
next(err);
});
},
// Grab location it got installed
function (next) {
tiver.getActivePath(function (err, sdkPath, minVersion) {
tiver.getActivePath(function (err, sdkPath, version) {
if (err) {
return next(err);
}
Expand Down Expand Up @@ -452,8 +503,15 @@ function build(callback) {
function (next) {
wrench.rmdirSyncRecursive(buildTempDir);
next();
}
},
// TODO Remove the Titanium SDK we installed to avoid cluttering up HDD?
function (next) {
if (!preBuildSelectedTiSDKVersion) {
return next();
}
console.log('Switching back to Ti SDK that was selected before our build.');
selectTiSDKVersion(preBuildSelectedTiSDKVersion, next);
}
], callback);
}

Expand Down