From a33d3c25a260368928cce0c13543acb7501344be Mon Sep 17 00:00:00 2001 From: bergwerkgis Date: Fri, 31 Mar 2017 11:13:17 +0200 Subject: [PATCH 01/16] test [trigger cloudbuild] --- scripts/build.csx | 59 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 46 insertions(+), 13 deletions(-) diff --git a/scripts/build.csx b/scripts/build.csx index 411b81635..773b93db2 100644 --- a/scripts/build.csx +++ b/scripts/build.csx @@ -76,11 +76,26 @@ if (!GetEnvVariable("APPVEYOR_REPO_COMMIT_MESSAGE", out commitMessage)) { Enviro string commitMessageEx; if (GetEnvVariable("APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED", out commitMessageEx)) { commitMessage += commitMessageEx; } +string commitAuthor = Environment.GetEnvironmentVariable("APPVEYOR_REPO_COMMIT_AUTHOR"); +if (string.IsNullOrWhiteSpace(commitAuthor)) { + commitAuthor = "no commit author available"; +} + +string originalCommit = Environment.GetEnvironmentVariable("APPVEYOR_REPO_COMMIT"); +string repoName = Environment.GetEnvironmentVariable("APPVEYOR_REPO_NAME"); +if (string.IsNullOrWhiteSpace(originalCommit)) { + originalCommit = "no SHA available"; +} else { + originalCommit = $"https://github.com/{repoName}/commit/{originalCommit}"; +} + string raiseErrorOnFailure; GetEnvVariable("UNITYPACKAGER_RAISE_ERROR_ON_FAILURE", out raiseErrorOnFailure); bool publishDocs = commitMessage.IndexOf("[publish docs]", StringComparison.InvariantCultureIgnoreCase) >= 0; +bool triggerCloudBuild = commitMessage.IndexOf("[trigger cloudbuild]", StringComparison.InvariantCultureIgnoreCase) >= 0; + string githubToken; if (publishDocs) { if (!GetEnvVariable("GITHUB_TOKEN", out githubToken)) { @@ -95,6 +110,7 @@ Console.WriteLine($"%UNITYPACKAGER_RAISE_ERROR_ON_FAILURE%: {raiseErrorOnFailure Console.WriteLine($"%APPVEYOR_BUILD_FOLDER%: {rootDir}"); Console.WriteLine($"%APPVEYOR_REPO_COMMIT_MESSAGE%: {commitMessage}"); Console.WriteLine($"publish docs: {publishDocs}"); +Console.WriteLine($"trigger Unity Cloud Build: {triggerCloudBuild}"); //---------- documentation @@ -119,23 +135,11 @@ if (!RunCommand(@"docfx documentation\docfx_project\docfx.json", true)) { } Console.WriteLine("docs successfully generated"); + if (!publishDocs) { Console.WriteLine("not publishing docs"); } else { try { - string originalCommit = Environment.GetEnvironmentVariable("APPVEYOR_REPO_COMMIT"); - string repoName = Environment.GetEnvironmentVariable("APPVEYOR_REPO_NAME"); - if (string.IsNullOrWhiteSpace(originalCommit)) { - originalCommit = "no SHA available"; - } else { - originalCommit = $"https://github.com/{repoName}/commit/{originalCommit}"; - } - - string commitAuthor = Environment.GetEnvironmentVariable("APPVEYOR_REPO_COMMIT_AUTHOR"); - if (string.IsNullOrWhiteSpace(commitAuthor)) { - commitAuthor = "no commit author available"; - } - string docsDir = Path.Combine(rootDir, "documentation", "docfx_project", "_site"); Console.WriteLine($"docs directory: {docsDir}"); Environment.CurrentDirectory = docsDir; @@ -159,6 +163,34 @@ if (!publishDocs) { } +//---------- trigger Unity Cloud Build +if (!triggerCloudBuild) { + Console.WriteLine("not triggering Unity Cloud Build"); +} else { + try { + string projectDir = Path.Combine(rootDir, "sdkproject"); + Console.WriteLine($"sdkproject directory: {projectDir}"); + Environment.CurrentDirectory = projectDir; + List cmds = new List(new string[]{ + "git init .", + "git add .", + $"git commit -m \"pushed via [{originalCommit}] by [{commitAuthor}]\"", + $"git remote add origin https://{githubToken}@github.com/{repoName}.git", + "git checkout -b unity-cloud-build", + "git push -f origin unity-cloud-build" + }); + foreach (var cmd in cmds) { + if (!RunCommand(cmd)) { + Console.Error.WriteLine("publishing docs failed"); + Environment.Exit(1); + } + } + } finally { + Environment.CurrentDirectory = rootDir; + } +} + + //---------- unitypackage Console.WriteLine("creating unitypackage ..."); if (!RunCommand(@"UnityPackager.exe unitypackage.config sdkproject\Assets\ mapbox-unity-sdk_LATEST.unitypackage", logOnErrorOnly: true)) { @@ -171,6 +203,7 @@ if (!RunCommand(@"UnityPackager.exe unitypackage.config sdkproject\Assets\ mapbo Console.WriteLine("====== summary ======="); Console.WriteLine(" * docs created successfully"); Console.WriteLine(string.Format(" * docs {0}", publishDocs ? "published successfully" : "not published")); +Console.WriteLine(string.Format(" * Unity Cloud Build {0}", triggerCloudBuild ? "triggered" : "not triggered")); if (raiseErrorOnFailure == "0") { Console.WriteLine(" * unitypackage created, but %UNITYPACKAGER_RAISE_ERROR_ON_FAILURE% was set to '0'!!!!!"); Console.WriteLine(" * unitypackage probably won't import into Unity !!!!!!!"); From cbc0ca7390c800f9ec9c195a13312c91610ffa38 Mon Sep 17 00:00:00 2001 From: bergwerkgis Date: Fri, 31 Mar 2017 11:25:20 +0200 Subject: [PATCH 02/16] test2 [trigger cloudbuild] --- scripts/build.csx | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/scripts/build.csx b/scripts/build.csx index 773b93db2..64cdf0cba 100644 --- a/scripts/build.csx +++ b/scripts/build.csx @@ -170,8 +170,20 @@ if (!triggerCloudBuild) { try { string projectDir = Path.Combine(rootDir, "sdkproject"); Console.WriteLine($"sdkproject directory: {projectDir}"); - Environment.CurrentDirectory = projectDir; + List cmds = new List(new string[]{ + "git rm -r --cached sdkproject", + "git commit -m \"Removed sdkproject from repository\"" + }); + foreach (var cmd in cmds) { + if (!RunCommand(cmd)) { + Console.Error.WriteLine("triggering Unity Cloud Build failed"); + Environment.Exit(1); + } + } + + Environment.CurrentDirectory = projectDir; + cmds = new List(new string[]{ "git init .", "git add .", $"git commit -m \"pushed via [{originalCommit}] by [{commitAuthor}]\"", @@ -181,7 +193,7 @@ if (!triggerCloudBuild) { }); foreach (var cmd in cmds) { if (!RunCommand(cmd)) { - Console.Error.WriteLine("publishing docs failed"); + Console.Error.WriteLine("triggering Unity Cloud Build failed"); Environment.Exit(1); } } From 14dac3ac2786a5985c11e2e220f18498243326b4 Mon Sep 17 00:00:00 2001 From: bergwerkgis Date: Fri, 31 Mar 2017 11:28:31 +0200 Subject: [PATCH 03/16] test3 [trigger cloudbuild] --- scripts/build.csx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/build.csx b/scripts/build.csx index 64cdf0cba..5a11ba165 100644 --- a/scripts/build.csx +++ b/scripts/build.csx @@ -97,10 +97,11 @@ bool publishDocs = commitMessage.IndexOf("[publish docs]", StringComparison.Inva bool triggerCloudBuild = commitMessage.IndexOf("[trigger cloudbuild]", StringComparison.InvariantCultureIgnoreCase) >= 0; string githubToken; -if (publishDocs) { +if (publishDocs || triggerCloudBuild) { if (!GetEnvVariable("GITHUB_TOKEN", out githubToken)) { publishDocs = false; - Console.Error.WriteLine("cannot publish docs without %GITHUB_TOKEN%"); + triggerCloudBuild = false; + Console.Error.WriteLine("no %GITHUB_TOKEN% set, cannot publish docs or trigger Unity Cloud Build"); Environment.Exit(1); } } From 71baab6821e2adbcbdfbd73d8d89822b3c06503e Mon Sep 17 00:00:00 2001 From: bergwerkgis Date: Fri, 31 Mar 2017 11:35:21 +0200 Subject: [PATCH 04/16] test4 [trigger cloudbuild], AppVeyor: exclude 'unity-cloud-build' to prevent recursive triggering of AppVeyor builds --- appveyor.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index b6125d018..2efc69450 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,3 +1,12 @@ +branches: +# whitelist + #only: + # - master + # - production + # blacklist + except: + - unity-cloud-build + image: Visual Studio 2015 init: From 554837014ddfb64ee97f345a69007303d27833f0 Mon Sep 17 00:00:00 2001 From: bergwerkgis Date: Fri, 31 Mar 2017 11:42:46 +0200 Subject: [PATCH 05/16] test5 [trigger cloudbuild], Appveyor does not honor branches:except --- appveyor.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 2efc69450..2d9b1bdec 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,9 +1,4 @@ branches: -# whitelist - #only: - # - master - # - production - # blacklist except: - unity-cloud-build From b44f10adf655b0c279fe6cbc3d2b543dfff134d3 Mon Sep 17 00:00:00 2001 From: bergwerkgis Date: Fri, 31 Mar 2017 11:48:17 +0200 Subject: [PATCH 06/16] test6 [trigger cloudbuild], Appveyor does not honor branches:except --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 2d9b1bdec..9b762883e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ branches: except: - - unity-cloud-build + - "unity-cloud-build" image: Visual Studio 2015 From c73455ed2540f254e8b8f00efd15a9a8822eb9eb Mon Sep 17 00:00:00 2001 From: bergwerkgis Date: Fri, 31 Mar 2017 12:21:38 +0200 Subject: [PATCH 07/16] test8 [trigger cloudbuild], delete .gitignore in 'sdkproject' --- scripts/build.csx | 89 ++++++++++++++++++++++++++--------------------- 1 file changed, 50 insertions(+), 39 deletions(-) diff --git a/scripts/build.csx b/scripts/build.csx index 5a11ba165..57a9f37f7 100644 --- a/scripts/build.csx +++ b/scripts/build.csx @@ -107,6 +107,7 @@ if (publishDocs || triggerCloudBuild) { } +Console.WriteLine(string.Format("GITHUB_TOKEN: {0} set", string.IsNullOrWhiteSpace(githubToken) ? "not": "is")); Console.WriteLine($"%UNITYPACKAGER_RAISE_ERROR_ON_FAILURE%: {raiseErrorOnFailure}"); Console.WriteLine($"%APPVEYOR_BUILD_FOLDER%: {rootDir}"); Console.WriteLine($"%APPVEYOR_REPO_COMMIT_MESSAGE%: {commitMessage}"); @@ -114,6 +115,54 @@ Console.WriteLine($"publish docs: {publishDocs}"); Console.WriteLine($"trigger Unity Cloud Build: {triggerCloudBuild}"); +//---------- trigger Unity Cloud Build: to this before generating docs to prevent some intermediate file to be part of this +if (!triggerCloudBuild) { + Console.WriteLine("not triggering Unity Cloud Build"); +} else { + try { + Console.WriteLine("about to trigger Unity Cloud Build ..."); + string projectDir = Path.Combine(rootDir, "sdkproject"); + Console.WriteLine($"sdkproject directory: {projectDir}"); + + Environment.CurrentDirectory = projectDir; + if(!RunCommand("del /F /S /Q .gitignore")){ + Console.Error.WriteLine("could not delete .gitignore"); + Environment.Exit(1); + } + + Environment.CurrentDirectory = rootDir; + List cmds = new List(new string[]{ + "git rm -r --cached sdkproject", + "git commit -m \"Removed sdkproject from repository\"" + }); + foreach (var cmd in cmds) { + if (!RunCommand(cmd)) { + Console.Error.WriteLine("triggering Unity Cloud Build failed"); + Environment.Exit(1); + } + } + + Environment.CurrentDirectory = projectDir; + cmds = new List(new string[]{ + "git init .", + "git add .", + $"git commit -m \"pushed via [{originalCommit}] by [{commitAuthor}]\"", + $"git remote add origin https://{githubToken}@github.com/{repoName}.git", + "git checkout -b unity-cloud-build", + "git push -f origin unity-cloud-build" + }); + foreach (var cmd in cmds) { + if (!RunCommand(cmd)) { + Console.Error.WriteLine("triggering Unity Cloud Build failed"); + Environment.Exit(1); + } + } + } finally { + Environment.CurrentDirectory = rootDir; + } +} + + //---------- documentation Console.WriteLine("downloading docfx ..."); if (!RunCommand("powershell Invoke-WebRequest https://github.com/dotnet/docfx/releases/download/v2.14.1/docfx.zip -OutFile docfx.zip", true, true)) { @@ -141,6 +190,7 @@ if (!publishDocs) { Console.WriteLine("not publishing docs"); } else { try { + Console.WriteLine("about to publish docs..."); string docsDir = Path.Combine(rootDir, "documentation", "docfx_project", "_site"); Console.WriteLine($"docs directory: {docsDir}"); Environment.CurrentDirectory = docsDir; @@ -164,45 +214,6 @@ if (!publishDocs) { } -//---------- trigger Unity Cloud Build -if (!triggerCloudBuild) { - Console.WriteLine("not triggering Unity Cloud Build"); -} else { - try { - string projectDir = Path.Combine(rootDir, "sdkproject"); - Console.WriteLine($"sdkproject directory: {projectDir}"); - - List cmds = new List(new string[]{ - "git rm -r --cached sdkproject", - "git commit -m \"Removed sdkproject from repository\"" - }); - foreach (var cmd in cmds) { - if (!RunCommand(cmd)) { - Console.Error.WriteLine("triggering Unity Cloud Build failed"); - Environment.Exit(1); - } - } - - Environment.CurrentDirectory = projectDir; - cmds = new List(new string[]{ - "git init .", - "git add .", - $"git commit -m \"pushed via [{originalCommit}] by [{commitAuthor}]\"", - $"git remote add origin https://{githubToken}@github.com/{repoName}.git", - "git checkout -b unity-cloud-build", - "git push -f origin unity-cloud-build" - }); - foreach (var cmd in cmds) { - if (!RunCommand(cmd)) { - Console.Error.WriteLine("triggering Unity Cloud Build failed"); - Environment.Exit(1); - } - } - } finally { - Environment.CurrentDirectory = rootDir; - } -} - //---------- unitypackage Console.WriteLine("creating unitypackage ..."); From 0134f32ae7eec89381100c0aa0e8bc612c9fddbc Mon Sep 17 00:00:00 2001 From: Siyu Song Date: Fri, 31 Mar 2017 11:53:15 -0700 Subject: [PATCH 08/16] test9 [trigger cloudbuild], change cloud build to private repo. --- scripts/build.csx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/build.csx b/scripts/build.csx index 57a9f37f7..3df049ccd 100644 --- a/scripts/build.csx +++ b/scripts/build.csx @@ -120,6 +120,7 @@ if (!triggerCloudBuild) { Console.WriteLine("not triggering Unity Cloud Build"); } else { try { + string cloudBuildRepo = "mapbox/mapbox-sdk-unity"; Console.WriteLine("about to trigger Unity Cloud Build ..."); string projectDir = Path.Combine(rootDir, "sdkproject"); Console.WriteLine($"sdkproject directory: {projectDir}"); @@ -147,9 +148,9 @@ if (!triggerCloudBuild) { "git init .", "git add .", $"git commit -m \"pushed via [{originalCommit}] by [{commitAuthor}]\"", - $"git remote add origin https://{githubToken}@github.com/{repoName}.git", - "git checkout -b unity-cloud-build", - "git push -f origin unity-cloud-build" + $"git remote add origin https://{githubToken}@github.com/{cloudBuildRepo}.git", + "git checkout -b CloudBuild", + "git push -f origin CloudBuild" }); foreach (var cmd in cmds) { if (!RunCommand(cmd)) { From 55c536b43a10158a5ee7afcde06ed93d313b822b Mon Sep 17 00:00:00 2001 From: Siyu Song Date: Fri, 31 Mar 2017 12:53:46 -0700 Subject: [PATCH 09/16] test9 [trigger cloudbuild], writing out token file for mapboxaccess token for cloudbuild --- appveyor.yml | 2 ++ scripts/build.csx | 11 +++++++++++ 2 files changed, 13 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 9b762883e..0fd98353a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,6 +13,8 @@ clone_depth: 5 environment: GITHUB_TOKEN: secure: lJJOC3O25ATwK7jNt2TeYC9LexbMpef6ZSJDS8J4OFYABWt53IDe8BPcBNuELiyJ + MAPBOX_ACCESS_TOKEN: + secure: dMZloaDRX0kslhjJRbDySkawDtY+1/42ke/v1B2LEQjSnvSp4RWTEkrxuyca3B4Y+Tw4dGg5KI9mL2WFvMQyI49UuIRoVACbIyr6s5pvn4bme5fKhbs/XxpecpzYOVSt install: - update-mapbox-unity-sdk-core.bat diff --git a/scripts/build.csx b/scripts/build.csx index 3df049ccd..47439d100 100644 --- a/scripts/build.csx +++ b/scripts/build.csx @@ -106,6 +106,15 @@ if (publishDocs || triggerCloudBuild) { } } +string mapboxAccessToken; +if (triggerCloudBuild) { + if (!GetEnvVariable("MAPBOX_ACCESS_TOKEN", out mapboxAccessToken)) { + triggerCloudBuild = false; + Console.Error.WriteLine("no %MAPBOX_ACCESS_TOKEN% set, cannot trigger Unity Cloud Build"); + Environment.Exit(1); + } +} + Console.WriteLine(string.Format("GITHUB_TOKEN: {0} set", string.IsNullOrWhiteSpace(githubToken) ? "not": "is")); Console.WriteLine($"%UNITYPACKAGER_RAISE_ERROR_ON_FAILURE%: {raiseErrorOnFailure}"); @@ -146,6 +155,8 @@ if (!triggerCloudBuild) { Environment.CurrentDirectory = projectDir; cmds = new List(new string[]{ "git init .", + "mkdir Assets/StreamingAssets", + $'echo {mapboxAccessToken} > Assets/StreamingAssets/MapboxAccess.text', "git add .", $"git commit -m \"pushed via [{originalCommit}] by [{commitAuthor}]\"", $"git remote add origin https://{githubToken}@github.com/{cloudBuildRepo}.git", From 6d9fdb534de5cc6981d0bfba8474f884962f84c1 Mon Sep 17 00:00:00 2001 From: Siyu Song Date: Fri, 31 Mar 2017 16:53:58 -0700 Subject: [PATCH 10/16] double quotes --- scripts/build.csx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build.csx b/scripts/build.csx index 47439d100..5e5f21ecb 100644 --- a/scripts/build.csx +++ b/scripts/build.csx @@ -156,7 +156,7 @@ if (!triggerCloudBuild) { cmds = new List(new string[]{ "git init .", "mkdir Assets/StreamingAssets", - $'echo {mapboxAccessToken} > Assets/StreamingAssets/MapboxAccess.text', + $"echo {mapboxAccessToken} > Assets/StreamingAssets/MapboxAccess.text", "git add .", $"git commit -m \"pushed via [{originalCommit}] by [{commitAuthor}]\"", $"git remote add origin https://{githubToken}@github.com/{cloudBuildRepo}.git", From 50f55697c1b072ab0f6b25e12bd25369b9b1c810 Mon Sep 17 00:00:00 2001 From: Siyu Song Date: Fri, 31 Mar 2017 17:19:01 -0700 Subject: [PATCH 11/16] test10 [trigger cloudbuild], test double quotes fix --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 385663574..36ea55b94 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Tools for using Mapbox with Unity. ## Build `unitypackage` -### On AppVeyor +### On AppVeyor - change version of `MapboxSDKforUnityCore` in `packages.config` to the one needed - push From 094d3558e94fb54e3cd2f290fb19480d87759e06 Mon Sep 17 00:00:00 2001 From: Siyu Song Date: Fri, 31 Mar 2017 17:23:33 -0700 Subject: [PATCH 12/16] test11 [trigger cloudbuild], test syntax fix --- scripts/build.csx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build.csx b/scripts/build.csx index 5e5f21ecb..7ca9d8bc0 100644 --- a/scripts/build.csx +++ b/scripts/build.csx @@ -155,8 +155,8 @@ if (!triggerCloudBuild) { Environment.CurrentDirectory = projectDir; cmds = new List(new string[]{ "git init .", - "mkdir Assets/StreamingAssets", - $"echo {mapboxAccessToken} > Assets/StreamingAssets/MapboxAccess.text", + "mkdir Assets\StreamingAssets", + $"echo {mapboxAccessToken} > Assets\StreamingAssets\MapboxAccess.text", "git add .", $"git commit -m \"pushed via [{originalCommit}] by [{commitAuthor}]\"", $"git remote add origin https://{githubToken}@github.com/{cloudBuildRepo}.git", From 4ad77b68aab0257c78e1bebfbb2c5758b76a73d8 Mon Sep 17 00:00:00 2001 From: Siyu Song Date: Fri, 31 Mar 2017 17:31:26 -0700 Subject: [PATCH 13/16] test12 [trigger cloudbuild], test syntax fix --- scripts/build.csx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build.csx b/scripts/build.csx index 7ca9d8bc0..e701eb1a1 100644 --- a/scripts/build.csx +++ b/scripts/build.csx @@ -155,8 +155,8 @@ if (!triggerCloudBuild) { Environment.CurrentDirectory = projectDir; cmds = new List(new string[]{ "git init .", - "mkdir Assets\StreamingAssets", - $"echo {mapboxAccessToken} > Assets\StreamingAssets\MapboxAccess.text", + $"mkdir {projectDir}/Assets/StreamingAssets", + $"echo {mapboxAccessToken} > {projectDir}/Assets/StreamingAssets/MapboxAccess.text", "git add .", $"git commit -m \"pushed via [{originalCommit}] by [{commitAuthor}]\"", $"git remote add origin https://{githubToken}@github.com/{cloudBuildRepo}.git", From e832927b06dcce45c4fc06a3342547e7e64d1924 Mon Sep 17 00:00:00 2001 From: Siyu Song Date: Fri, 31 Mar 2017 17:33:45 -0700 Subject: [PATCH 14/16] test13 [trigger cloudbuild], test syntax fix --- scripts/build.csx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/build.csx b/scripts/build.csx index e701eb1a1..05bd5a264 100644 --- a/scripts/build.csx +++ b/scripts/build.csx @@ -164,6 +164,8 @@ if (!triggerCloudBuild) { "git push -f origin CloudBuild" }); foreach (var cmd in cmds) { + Console.WriteLine("RUNNING COMMAND:"); + Console.WriteLine(cmd); if (!RunCommand(cmd)) { Console.Error.WriteLine("triggering Unity Cloud Build failed"); Environment.Exit(1); From 5849bec886d6a6b4b66110bfd4e2a9b6be2be907 Mon Sep 17 00:00:00 2001 From: Siyu Song Date: Fri, 31 Mar 2017 17:37:38 -0700 Subject: [PATCH 15/16] test14 [trigger cloudbuild], test syntax fix --- scripts/build.csx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build.csx b/scripts/build.csx index 05bd5a264..121407c37 100644 --- a/scripts/build.csx +++ b/scripts/build.csx @@ -155,8 +155,8 @@ if (!triggerCloudBuild) { Environment.CurrentDirectory = projectDir; cmds = new List(new string[]{ "git init .", - $"mkdir {projectDir}/Assets/StreamingAssets", - $"echo {mapboxAccessToken} > {projectDir}/Assets/StreamingAssets/MapboxAccess.text", + $"mkdir {projectDir}\\Assets\\StreamingAssets", + $"echo {mapboxAccessToken} > {projectDir}\\Assets\\StreamingAssets\\MapboxAccess.text", "git add .", $"git commit -m \"pushed via [{originalCommit}] by [{commitAuthor}]\"", $"git remote add origin https://{githubToken}@github.com/{cloudBuildRepo}.git", From 31028dcfcb5cf3cd6a38e93207e09ae37c0f8f2d Mon Sep 17 00:00:00 2001 From: Siyu Song Date: Fri, 31 Mar 2017 17:41:19 -0700 Subject: [PATCH 16/16] removing print statement --- scripts/build.csx | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/build.csx b/scripts/build.csx index 121407c37..da7e51a32 100644 --- a/scripts/build.csx +++ b/scripts/build.csx @@ -164,8 +164,6 @@ if (!triggerCloudBuild) { "git push -f origin CloudBuild" }); foreach (var cmd in cmds) { - Console.WriteLine("RUNNING COMMAND:"); - Console.WriteLine(cmd); if (!RunCommand(cmd)) { Console.Error.WriteLine("triggering Unity Cloud Build failed"); Environment.Exit(1);