Use full path to scripts
parent
5a00d7bf75
commit
12fc1f50f7
|
|
@ -64,7 +64,7 @@ function run() {
|
||||||
// default and local case
|
// default and local case
|
||||||
default:
|
default:
|
||||||
core.info('Building locally');
|
core.info('Building locally');
|
||||||
platform_setup_1.default.setup(buildParameters);
|
platform_setup_1.default.setup(buildParameters, actionFolder);
|
||||||
if (process.platform === 'darwin') {
|
if (process.platform === 'darwin') {
|
||||||
mac_builder_1.default.run(actionFolder, workspace, buildParameters);
|
mac_builder_1.default.run(actionFolder, workspace, buildParameters);
|
||||||
}
|
}
|
||||||
|
|
@ -1276,7 +1276,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
|
||||||
const platform_setup_1 = __webpack_require__(2014);
|
const platform_setup_1 = __webpack_require__(2014);
|
||||||
const validate_windows_1 = __importDefault(__webpack_require__(41563));
|
const validate_windows_1 = __importDefault(__webpack_require__(41563));
|
||||||
class PlatformSetup {
|
class PlatformSetup {
|
||||||
static setup(buildParameters) {
|
static setup(buildParameters, actionFolder) {
|
||||||
return __awaiter(this, void 0, void 0, function* () {
|
return __awaiter(this, void 0, void 0, function* () {
|
||||||
switch (process.platform) {
|
switch (process.platform) {
|
||||||
case 'win32':
|
case 'win32':
|
||||||
|
|
@ -1284,7 +1284,7 @@ class PlatformSetup {
|
||||||
platform_setup_1.SetupWindows.setup(buildParameters);
|
platform_setup_1.SetupWindows.setup(buildParameters);
|
||||||
break;
|
break;
|
||||||
case 'darwin':
|
case 'darwin':
|
||||||
platform_setup_1.SetupMac.setup(buildParameters);
|
platform_setup_1.SetupMac.setup(buildParameters, actionFolder);
|
||||||
break;
|
break;
|
||||||
//Add other baseOS's here
|
//Add other baseOS's here
|
||||||
}
|
}
|
||||||
|
|
@ -1332,10 +1332,11 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
|
||||||
const unity_changeset_1 = __webpack_require__(4635);
|
const unity_changeset_1 = __webpack_require__(4635);
|
||||||
class SetupMac {
|
class SetupMac {
|
||||||
//static unityHubPath = `/Applications/Unity\\\\ Hub.app/Contents/MacOS/Unity\\\\ Hub`;
|
//static unityHubPath = `/Applications/Unity\\\\ Hub.app/Contents/MacOS/Unity\\\\ Hub`;
|
||||||
static setup(buildParameters) {
|
static setup(buildParameters, actionFolder) {
|
||||||
return __awaiter(this, void 0, void 0, function* () {
|
return __awaiter(this, void 0, void 0, function* () {
|
||||||
const changeset = yield unity_changeset_1.getUnityChangeset(buildParameters.version).changeset;
|
const changeset = yield unity_changeset_1.getUnityChangeset(buildParameters.version).changeset;
|
||||||
//Since we are using shell scripts on the host, we need to set the environment variables from here
|
//Since we are using shell scripts on the host, we need to set the environment variables from here
|
||||||
|
process.env.SCRIPT_DIRECTORY = `${actionFolder}/platforms/mac/`;
|
||||||
process.env.UNITY_VERSION = buildParameters.version;
|
process.env.UNITY_VERSION = buildParameters.version;
|
||||||
process.env.UNITY_CHANGESET = changeset;
|
process.env.UNITY_CHANGESET = changeset;
|
||||||
process.env.UNITY_SERIAL = buildParameters.unitySerial;
|
process.env.UNITY_SERIAL = buildParameters.unitySerial;
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -3,10 +3,10 @@
|
||||||
#
|
#
|
||||||
# Run steps
|
# Run steps
|
||||||
#
|
#
|
||||||
source /steps/setup.sh
|
source $SCRIPT_DIRECTORY/steps/setup.sh
|
||||||
source /steps/activate.sh
|
source $SCRIPT_DIRECTORY/steps/activate.sh
|
||||||
source /steps/build.sh
|
source $SCRIPT_DIRECTORY/steps/build.sh
|
||||||
source /steps/return_license.sh
|
source $SCRIPT_DIRECTORY/steps/return_license.sh
|
||||||
|
|
||||||
#
|
#
|
||||||
# Instructions for debugging
|
# Instructions for debugging
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@ async function run() {
|
||||||
// default and local case
|
// default and local case
|
||||||
default:
|
default:
|
||||||
core.info('Building locally');
|
core.info('Building locally');
|
||||||
PlatformSetup.setup(buildParameters);
|
PlatformSetup.setup(buildParameters, actionFolder);
|
||||||
if (process.platform === 'darwin') {
|
if (process.platform === 'darwin') {
|
||||||
MacBuilder.run(actionFolder, workspace, buildParameters);
|
MacBuilder.run(actionFolder, workspace, buildParameters);
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
|
|
@ -3,14 +3,14 @@ import { SetupWindows, SetupMac } from './platform-setup/';
|
||||||
import ValidateWindows from './platform-validation/validate-windows';
|
import ValidateWindows from './platform-validation/validate-windows';
|
||||||
|
|
||||||
class PlatformSetup {
|
class PlatformSetup {
|
||||||
static async setup(buildParameters: BuildParameters) {
|
static async setup(buildParameters: BuildParameters, actionFolder: string) {
|
||||||
switch (process.platform) {
|
switch (process.platform) {
|
||||||
case 'win32':
|
case 'win32':
|
||||||
ValidateWindows.validate(buildParameters);
|
ValidateWindows.validate(buildParameters);
|
||||||
SetupWindows.setup(buildParameters);
|
SetupWindows.setup(buildParameters);
|
||||||
break;
|
break;
|
||||||
case 'darwin':
|
case 'darwin':
|
||||||
SetupMac.setup(buildParameters);
|
SetupMac.setup(buildParameters, actionFolder);
|
||||||
break;
|
break;
|
||||||
//Add other baseOS's here
|
//Add other baseOS's here
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,9 +4,10 @@ import { getUnityChangeset } from 'unity-changeset';
|
||||||
class SetupMac {
|
class SetupMac {
|
||||||
//static unityHubPath = `/Applications/Unity\\\\ Hub.app/Contents/MacOS/Unity\\\\ Hub`;
|
//static unityHubPath = `/Applications/Unity\\\\ Hub.app/Contents/MacOS/Unity\\\\ Hub`;
|
||||||
|
|
||||||
public static async setup(buildParameters: BuildParameters) {
|
public static async setup(buildParameters: BuildParameters, actionFolder: string) {
|
||||||
const changeset = await getUnityChangeset(buildParameters.version).changeset;
|
const changeset = await getUnityChangeset(buildParameters.version).changeset;
|
||||||
//Since we are using shell scripts on the host, we need to set the environment variables from here
|
//Since we are using shell scripts on the host, we need to set the environment variables from here
|
||||||
|
process.env.SCRIPT_DIRECTORY = `${actionFolder}/platforms/mac/`;
|
||||||
process.env.UNITY_VERSION = buildParameters.version;
|
process.env.UNITY_VERSION = buildParameters.version;
|
||||||
process.env.UNITY_CHANGESET = changeset;
|
process.env.UNITY_CHANGESET = changeset;
|
||||||
process.env.UNITY_SERIAL = buildParameters.unitySerial;
|
process.env.UNITY_SERIAL = buildParameters.unitySerial;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue