From 0c5bef544fc33443d4661f294735798a33140121 Mon Sep 17 00:00:00 2001 From: Adarsh Pavani Date: Thu, 25 Jan 2018 18:15:40 -0800 Subject: [PATCH 001/109] configuring travis to download unity and create a build. lets test it --- scripts/build.sh | 42 +++++++++++++++++++ scripts/install.sh | 29 +++++++++++++ .../Examples/VectorDataVisualization.meta | 10 +++++ .../VectorDataVisualization.meta | 10 +++++ sdkproject/Assets/StreamingAssets.meta | 10 +++++ .../StreamingAssets/build_info.txt.meta | 9 ++++ sdkproject/ProjectSettings/ProjectVersion.txt | 2 +- sdkproject/UnityPackageManager/manifest.json | 4 ++ travis.yml | 10 +++++ 9 files changed, 125 insertions(+), 1 deletion(-) create mode 100644 scripts/build.sh create mode 100644 scripts/install.sh create mode 100644 sdkproject/Assets/Mapbox/Examples/VectorDataVisualization.meta create mode 100644 sdkproject/Assets/Mapbox/Examples/VectorDataVisualization/VectorDataVisualization.meta create mode 100644 sdkproject/Assets/StreamingAssets.meta create mode 100644 sdkproject/Assets/StreamingAssets/build_info.txt.meta create mode 100644 sdkproject/UnityPackageManager/manifest.json create mode 100644 travis.yml diff --git a/scripts/build.sh b/scripts/build.sh new file mode 100644 index 000000000..aa8c900fc --- /dev/null +++ b/scripts/build.sh @@ -0,0 +1,42 @@ +#! /bin/sh + +project="sdkproject" + +echo "Attempting to build $project for Windows" +/Applications/Unity/Unity.app/Contents/MacOS/Unity + -batchmode + -nographics + -silent-crashes + -logFile $(pwd)/unity.log + -projectPath $(pwd) + -buildWindowsPlayer "$(pwd)/Build/windows/$project.exe" + -quit + +echo "Attempting to build $project for OS X" +/Applications/Unity/Unity.app/Contents/MacOS/Unity + -batchmode + -nographics + -silent-crashes + -logFile $(pwd)/unity.log + -projectPath $(pwd) + -buildOSXUniversalPlayer "$(pwd)/Build/osx/$project.app" + -quit + +echo "Attempting to build $project for Linux" +/Applications/Unity/Unity.app/Contents/MacOS/Unity + -batchmode + -nographics + -silent-crashes + -logFile $(pwd)/unity.log + -projectPath $(pwd) + -buildLinuxUniversalPlayer "$(pwd)/Build/linux/$project.exe" + -quit + +echo 'Logs from build' +cat $(pwd)/unity.log + + +echo 'Attempting to zip builds' +zip -r $(pwd)/Build/linux.zip $(pwd)/Build/linux/ +zip -r $(pwd)/Build/mac.zip $(pwd)/Build/osx/ +zip -r $(pwd)/Build/windows.zip $(pwd)/Build/windows/ \ No newline at end of file diff --git a/scripts/install.sh b/scripts/install.sh new file mode 100644 index 000000000..94338accb --- /dev/null +++ b/scripts/install.sh @@ -0,0 +1,29 @@ +#! /bin/sh + +BASE_URL=https://download.unity3d.com/download_unity +HASH=472613c02cf7 +VERSION=2017.1.0f3 + +download() { + file=$1 + url="$BASE_URL/$HASH/$package" + + echo "Downloading from $url: " + curl -o `basename "$package"` "$url" +} + +install() { + package=$1 + download "$package" + + echo "Installing "`basename "$package"` + sudo installer -dumplog -package `basename "$package"` -target / +} + +# See $BASE_URL/$HASH/unity-$VERSION-$PLATFORM.ini for complete list +# of available packages, where PLATFORM is `osx` or `win` + +install "MacEditorInstaller/Unity-$VERSION.pkg" +install "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg" +install "MacEditorTargetInstaller/UnitySetup-Mac-Support-for-Editor-$VERSION.pkg" +install "MacEditorTargetInstaller/UnitySetup-Linux-Support-for-Editor-$VERSION.pkg" \ No newline at end of file diff --git a/sdkproject/Assets/Mapbox/Examples/VectorDataVisualization.meta b/sdkproject/Assets/Mapbox/Examples/VectorDataVisualization.meta new file mode 100644 index 000000000..a844fee0c --- /dev/null +++ b/sdkproject/Assets/Mapbox/Examples/VectorDataVisualization.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: b8aaf5591d1784538916ed7ea18ca18a +folderAsset: yes +timeCreated: 1485384708 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/Mapbox/Examples/VectorDataVisualization/VectorDataVisualization.meta b/sdkproject/Assets/Mapbox/Examples/VectorDataVisualization/VectorDataVisualization.meta new file mode 100644 index 000000000..21bff49e1 --- /dev/null +++ b/sdkproject/Assets/Mapbox/Examples/VectorDataVisualization/VectorDataVisualization.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 68e3d92ca03a244d484e443f5b16b938 +folderAsset: yes +timeCreated: 1516308464 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/StreamingAssets.meta b/sdkproject/Assets/StreamingAssets.meta new file mode 100644 index 000000000..78e797308 --- /dev/null +++ b/sdkproject/Assets/StreamingAssets.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 7ad5bb5010449443388dd2ce544bad0a +folderAsset: yes +timeCreated: 1516342779 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/Assets/StreamingAssets/build_info.txt.meta b/sdkproject/Assets/StreamingAssets/build_info.txt.meta new file mode 100644 index 000000000..14d063e85 --- /dev/null +++ b/sdkproject/Assets/StreamingAssets/build_info.txt.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 0dbf58a5ca9c849e9b82091275a3a98b +timeCreated: 1516342780 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/ProjectSettings/ProjectVersion.txt b/sdkproject/ProjectSettings/ProjectVersion.txt index ca1aa057c..e6cd1f978 100644 --- a/sdkproject/ProjectSettings/ProjectVersion.txt +++ b/sdkproject/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2017.1.0f3 +m_EditorVersion: 2017.3.0f3 diff --git a/sdkproject/UnityPackageManager/manifest.json b/sdkproject/UnityPackageManager/manifest.json new file mode 100644 index 000000000..526aca605 --- /dev/null +++ b/sdkproject/UnityPackageManager/manifest.json @@ -0,0 +1,4 @@ +{ + "dependencies": { + } +} diff --git a/travis.yml b/travis.yml new file mode 100644 index 000000000..fe1bc30b9 --- /dev/null +++ b/travis.yml @@ -0,0 +1,10 @@ +language: objective-c +osx_image: xcode9.1 +rvm: +- 2.2 +before_install: +- chmod a+x ./update-mapbox-unity-sdk-core.sh +install: +- ./scripts/install.sh +script: +- ./scripts/build.sh \ No newline at end of file From 0a3e2ffad62c9481816bcc20c7f0a802eeaf2ed7 Mon Sep 17 00:00:00 2001 From: Adarsh Pavani Date: Thu, 25 Jan 2018 21:29:32 -0800 Subject: [PATCH 002/109] changing file name --- travis.yml => build.travis.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename travis.yml => build.travis.yml (100%) diff --git a/travis.yml b/build.travis.yml similarity index 100% rename from travis.yml rename to build.travis.yml From 4c73f804586fe1424eb1ac812126c1813276f75d Mon Sep 17 00:00:00 2001 From: Adarsh Pavani Date: Thu, 25 Jan 2018 21:35:28 -0800 Subject: [PATCH 003/109] removing appveyor.yml --- appveyor.yml | 39 ---------------------------------- build.travis.yml => travis.yml | 0 2 files changed, 39 deletions(-) delete mode 100644 appveyor.yml rename build.travis.yml => travis.yml (100%) diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 3cad1c134..000000000 --- a/appveyor.yml +++ /dev/null @@ -1,39 +0,0 @@ -branches: - except: - - "unity-cloud-build" - - gh-pages - - mb-pages - -image: Visual Studio 2015 - -init: - - git config --global core.autocrlf input - -#don't use 'shallow_clone: true' as we have submodules -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 - -build_script: -#let UnityPackager finish sucessfully, even after encounting errors, eg missing '.meta' files - - SET UNITYPACKAGER_RAISE_ERROR_ON_FAILURE=0 - - SET PATH=%CD%\scriptcs;%PATH% - - SET PATH=%CD%\docfx;%PATH% - - SET PATH=C:\Program Files\7-Zip;%PATH% -#get scriptcs - - powershell -NoProfile -ExecutionPolicy unrestricted -Command "iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/mapbox/mapbox-sdk-cs/master/scripts/get-scriptcs.ps1'))" -#build and publish documentation, create unitypackage - - scriptcs scripts\build.csx - -artifacts: - - path: 'mapbox-unity-sdk_*.unitypackage' - name: UnityPackage - - path: documentation\docfx_project\_site - name: site diff --git a/build.travis.yml b/travis.yml similarity index 100% rename from build.travis.yml rename to travis.yml From a775bc2532a879f705876fb7cbca552a20e22260 Mon Sep 17 00:00:00 2001 From: Adarsh Pavani Date: Thu, 25 Jan 2018 21:58:18 -0800 Subject: [PATCH 004/109] test --- travis.yml => config.travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename travis.yml => config.travis.yml (87%) diff --git a/travis.yml b/config.travis.yml similarity index 87% rename from travis.yml rename to config.travis.yml index fe1bc30b9..53c177227 100644 --- a/travis.yml +++ b/config.travis.yml @@ -1,4 +1,4 @@ -language: objective-c +language: C# osx_image: xcode9.1 rvm: - 2.2 From 8e88b115faa5fcdd92df14d51b2666973b36b99a Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Thu, 25 Jan 2018 22:05:34 -0800 Subject: [PATCH 005/109] Update .travis.yml --- .travis.yml | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 150dc9fdf..6c0c26e8a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,17 +1,10 @@ -git: - submodules: false - -env: - global: - - TERM: dumb - # Access token. - - secure: EryHh1gSsheLZcW/dnxGRwvVDRiJDgsGp13ylgve55wvatqM+H8toDFY70PwLW03YbJIHEjQCVraDxuc0dFtQfS7fMr7rUc9fgtxQapbQ1CAfpXe8FaSN4JbIRnqSnMq2dN1dpwRRVFIuW2H1axpfTFZ2NBVk7Y63HCrC2AUJLFb1O0EIr/R5G5FHzyQ7lAM7/ycuEdchso+XIi6uzPIBAUIR9H1si64+GzVpYskHhd83TSvo60AxVA7+BiwfrUKVfRo8HkJhvTMrVfLRcFnQK6TCYrvLXj8n5dJtfWgItRG5VLAe8gbjdXiC9uY14qP6WmRKCCEcYsTZWlVX5BCskrVVFS38V1uNFVRCaIeEKC00eDFyBn0+8HgXWB2yLHJWykm05zZGJ/Jg3anEM166bcHuT8BTK0E0V6C9lO+IpXO0jzh3YDe2xJW65uUl82oL955QniNml2Xijb+MiQCCcTKof2iRD4hSbnNWbLKa8xVFe2q22f7ihsJBxXAvh3jHaBmrYCQFFWRj6O+xM2pFFCnH2o32b45rhcqMpIKA5kkWbcWUcKXJhaDx46oT4+cEw+tCghtV0ehbwelLgTA9Za1Cs5voa8Pc1brYOEhv97WZQ5KNt0UGCkwj1DxXvlGpYCyAF36hkBv9me67ADNzTQa+udKwT156wULPMQBacY= - -language: - - csharp - -mono: - - latest - +language: chsarp +osx_image: xcode9.1 +rvm: +- 2.2 +before_install: +- chmod a+x ./update-mapbox-unity-sdk-core.sh +install: +- ./scripts/install.sh script: - - ./scripts/build-docs.sh +- ./scripts/build.sh From cd7a42c13d32ffc265816c7aa1ed8e138edc4cd1 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Thu, 25 Jan 2018 22:12:30 -0800 Subject: [PATCH 006/109] Update .travis.yml --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6c0c26e8a..4d69e23f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,11 @@ osx_image: xcode9.1 rvm: - 2.2 before_install: -- chmod a+x ./update-mapbox-unity-sdk-core.sh +- chmod a+x ./scripts/install.sh +- chmod a+x ./scripts/build.sh + install: +- ./update-mapbox-unity-sdk-core.sh - ./scripts/install.sh script: - ./scripts/build.sh From 58dedbf5194ea80ce302b800547ed648e78cfd74 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Thu, 25 Jan 2018 22:15:03 -0800 Subject: [PATCH 007/109] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 4d69e23f3..e2dfbf4a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ osx_image: xcode9.1 rvm: - 2.2 before_install: +- chmod a+x ./update-mapbox-unity-sdk-core.sh - chmod a+x ./scripts/install.sh - chmod a+x ./scripts/build.sh From fb2f76859d2acfea84925831e51bc1112ec81fbf Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Thu, 25 Jan 2018 22:22:14 -0800 Subject: [PATCH 008/109] Update install.sh --- scripts/install.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/install.sh b/scripts/install.sh index 94338accb..f900f2572 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -26,4 +26,3 @@ install() { install "MacEditorInstaller/Unity-$VERSION.pkg" install "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg" install "MacEditorTargetInstaller/UnitySetup-Mac-Support-for-Editor-$VERSION.pkg" -install "MacEditorTargetInstaller/UnitySetup-Linux-Support-for-Editor-$VERSION.pkg" \ No newline at end of file From 3ec599f8aee966616ad6eb6fc01ecdb01551bc20 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Thu, 25 Jan 2018 22:23:29 -0800 Subject: [PATCH 009/109] Update build.sh --- scripts/build.sh | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index aa8c900fc..6ce12df77 100644 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -22,21 +22,10 @@ echo "Attempting to build $project for OS X" -buildOSXUniversalPlayer "$(pwd)/Build/osx/$project.app" -quit -echo "Attempting to build $project for Linux" -/Applications/Unity/Unity.app/Contents/MacOS/Unity - -batchmode - -nographics - -silent-crashes - -logFile $(pwd)/unity.log - -projectPath $(pwd) - -buildLinuxUniversalPlayer "$(pwd)/Build/linux/$project.exe" - -quit - echo 'Logs from build' cat $(pwd)/unity.log echo 'Attempting to zip builds' -zip -r $(pwd)/Build/linux.zip $(pwd)/Build/linux/ zip -r $(pwd)/Build/mac.zip $(pwd)/Build/osx/ -zip -r $(pwd)/Build/windows.zip $(pwd)/Build/windows/ \ No newline at end of file +zip -r $(pwd)/Build/windows.zip $(pwd)/Build/windows/ From 070285744809f0ac0846660744fda11f07738499 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Thu, 25 Jan 2018 22:29:16 -0800 Subject: [PATCH 010/109] Update install.sh --- scripts/install.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/install.sh b/scripts/install.sh index f900f2572..088aa4e51 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -25,4 +25,3 @@ install() { install "MacEditorInstaller/Unity-$VERSION.pkg" install "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg" -install "MacEditorTargetInstaller/UnitySetup-Mac-Support-for-Editor-$VERSION.pkg" From 3f134569ce415bea4ba162a6a669701803e3dc85 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Thu, 25 Jan 2018 22:44:24 -0800 Subject: [PATCH 011/109] Update install.sh --- scripts/install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install.sh b/scripts/install.sh index 088aa4e51..e9c9d71d2 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -24,4 +24,5 @@ install() { # of available packages, where PLATFORM is `osx` or `win` install "MacEditorInstaller/Unity-$VERSION.pkg" +wait install "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg" From 28931c52f96b0fe8aa64fc6743abbc39180195d1 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Thu, 25 Jan 2018 22:49:11 -0800 Subject: [PATCH 012/109] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index e2dfbf4a1..6b0479b1f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: chsarp osx_image: xcode9.1 +sudo: required rvm: - 2.2 before_install: From c3dce10764cfaaf1e9653236ff21475f9afb1c06 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Thu, 25 Jan 2018 23:00:29 -0800 Subject: [PATCH 013/109] Update install.sh --- scripts/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install.sh b/scripts/install.sh index e9c9d71d2..d0a744478 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -17,7 +17,7 @@ install() { download "$package" echo "Installing "`basename "$package"` - sudo installer -dumplog -package `basename "$package"` -target / + installer -dumplog -package `basename "$package"` -target / } # See $BASE_URL/$HASH/unity-$VERSION-$PLATFORM.ini for complete list From b3cea078ba7c7950f04cef834000ea9309837bf9 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Thu, 25 Jan 2018 23:00:57 -0800 Subject: [PATCH 014/109] Update .travis.yml --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6b0479b1f..e2dfbf4a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: chsarp osx_image: xcode9.1 -sudo: required rvm: - 2.2 before_install: From b650413a736880bad13f9fe3630eeff652eef9fe Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Thu, 25 Jan 2018 23:08:46 -0800 Subject: [PATCH 015/109] Update .travis.yml --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index e2dfbf4a1..3690c74c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,6 @@ language: chsarp +sudo: required + osx_image: xcode9.1 rvm: - 2.2 From 5460a5ffcdb8628f32728db0290e8fcf56cc7a5c Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Thu, 25 Jan 2018 23:09:11 -0800 Subject: [PATCH 016/109] Update install.sh --- scripts/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install.sh b/scripts/install.sh index d0a744478..e9c9d71d2 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -17,7 +17,7 @@ install() { download "$package" echo "Installing "`basename "$package"` - installer -dumplog -package `basename "$package"` -target / + sudo installer -dumplog -package `basename "$package"` -target / } # See $BASE_URL/$HASH/unity-$VERSION-$PLATFORM.ini for complete list From f0ac09b39e918474bec3282c503f91c3fbcec417 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Thu, 25 Jan 2018 23:20:47 -0800 Subject: [PATCH 017/109] Update .travis.yml --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3690c74c6..ef3e599e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ -language: chsarp +language: objective-c sudo: required - -osx_image: xcode9.1 +osx_image: xcode9.2 rvm: - 2.2 before_install: From 59af0560102be00438a7a51e4f6b8cb19bfe6775 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Thu, 25 Jan 2018 23:23:33 -0800 Subject: [PATCH 018/109] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index ef3e599e6..a0ceca2d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: objective-c sudo: required +os: osx osx_image: xcode9.2 rvm: - 2.2 From 71c36f2b5ae98141214a5e3d9a835452b0690c25 Mon Sep 17 00:00:00 2001 From: BergWerkGIS Date: Fri, 26 Jan 2018 10:20:59 +0100 Subject: [PATCH 019/109] small changes to build.sh and install.sh, a+x for both --- scripts/build.sh | 0 scripts/install.sh | 8 ++++++-- 2 files changed, 6 insertions(+), 2 deletions(-) mode change 100644 => 100755 scripts/build.sh mode change 100644 => 100755 scripts/install.sh diff --git a/scripts/build.sh b/scripts/build.sh old mode 100644 new mode 100755 diff --git a/scripts/install.sh b/scripts/install.sh old mode 100644 new mode 100755 index e9c9d71d2..c5be3c69f --- a/scripts/install.sh +++ b/scripts/install.sh @@ -1,5 +1,9 @@ #! /bin/sh +set -eu + +df -h + BASE_URL=https://download.unity3d.com/download_unity HASH=472613c02cf7 VERSION=2017.1.0f3 @@ -7,9 +11,9 @@ VERSION=2017.1.0f3 download() { file=$1 url="$BASE_URL/$HASH/$package" + localFile=`basename "$package"` - echo "Downloading from $url: " - curl -o `basename "$package"` "$url" + if [ ! -f "$localFile" ]; then echo "Downloading $url" && curl -o "$localFile" "$url"; fi } install() { From 3d02350f42434997dce8cf08dcf9d7d07e614b31 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Sat, 27 Jan 2018 13:58:22 -0800 Subject: [PATCH 020/109] Update build.sh --- scripts/build.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index 6ce12df77..81a96d553 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -7,9 +7,10 @@ echo "Attempting to build $project for Windows" -batchmode -nographics -silent-crashes - -logFile $(pwd)/unity.log - -projectPath $(pwd) - -buildWindowsPlayer "$(pwd)/Build/windows/$project.exe" + -logFile "$(pwd)/windows-build.log" + -projectPath "$(pwd)/$(project)" + -buildWindowsPlayer "$(pwd)/Build/windows/$project.exe" + -stackTraceLogType Full -quit echo "Attempting to build $project for OS X" @@ -17,14 +18,15 @@ echo "Attempting to build $project for OS X" -batchmode -nographics -silent-crashes - -logFile $(pwd)/unity.log - -projectPath $(pwd) - -buildOSXUniversalPlayer "$(pwd)/Build/osx/$project.app" + -logFile "$(pwd)/mac-build.log" + -projectPath "$(pwd)/$(project)" + -buildOSXUniversalPlayer "$(pwd)/Build/osx/$project.app" + -stackTraceLogType Full -quit echo 'Logs from build' -cat $(pwd)/unity.log - +cat "$(pwd)/windows-build.log" +cat "$(pwd)/mac-build.log" echo 'Attempting to zip builds' zip -r $(pwd)/Build/mac.zip $(pwd)/Build/osx/ From 9299d86cdb4743af54de7464ebef1d00a19b3959 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Sat, 27 Jan 2018 15:09:08 -0800 Subject: [PATCH 021/109] Update .travis.yml --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index a0ceca2d2..1a0518d7c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,13 +4,11 @@ os: osx osx_image: xcode9.2 rvm: - 2.2 -before_install: -- chmod a+x ./update-mapbox-unity-sdk-core.sh -- chmod a+x ./scripts/install.sh -- chmod a+x ./scripts/build.sh install: - ./update-mapbox-unity-sdk-core.sh - ./scripts/install.sh +- travis_wait 30 mvn install + script: - ./scripts/build.sh From 77338fb076103239115b1ea7e722d5a8518abfb2 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Sat, 27 Jan 2018 15:46:03 -0800 Subject: [PATCH 022/109] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 1a0518d7c..e4b01e22d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ rvm: - 2.2 install: +- "travis_wait 30 sleep 1800 &" - ./update-mapbox-unity-sdk-core.sh - ./scripts/install.sh - travis_wait 30 mvn install From f62195b5543fa707840391131bada6d35f2a5e06 Mon Sep 17 00:00:00 2001 From: Adarsh Pavani Date: Thu, 1 Feb 2018 14:18:46 -0500 Subject: [PATCH 023/109] adding the right script --- scripts/build.sh | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index 81a96d553..6de051688 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -1,28 +1,30 @@ #! /bin/sh +set -eu + project="sdkproject" echo "Attempting to build $project for Windows" -/Applications/Unity/Unity.app/Contents/MacOS/Unity - -batchmode - -nographics - -silent-crashes - -logFile "$(pwd)/windows-build.log" - -projectPath "$(pwd)/$(project)" - -buildWindowsPlayer "$(pwd)/Build/windows/$project.exe" - -stackTraceLogType Full - -quit +/Applications/Unity/Unity.app/Contents/MacOS/Unity \ +-batchmode \ +-nographics \ +-silent-crashes \ +-logFile "$(pwd)/windows-build.log" \ +-projectPath "$(pwd)/${project}" \ +-buildWindowsPlayer "$(pwd)/Build/windows/${project}.exe" \ +-stackTraceLogType Full \ +-quit echo "Attempting to build $project for OS X" -/Applications/Unity/Unity.app/Contents/MacOS/Unity - -batchmode - -nographics - -silent-crashes - -logFile "$(pwd)/mac-build.log" - -projectPath "$(pwd)/$(project)" - -buildOSXUniversalPlayer "$(pwd)/Build/osx/$project.app" - -stackTraceLogType Full - -quit +/Applications/Unity/Unity.app/Contents/MacOS/Unity \ +-batchmode \ +-nographics \ +-silent -crashes \ +-logFile "$(pwd)/mac-build.log" \ +-projectPath "$(pwd)/${project}" \ +-buildOSXUniversalPlayer "$(pwd)/Build/osx/${project}.app" \ +-stackTraceLogType Full \ +-quit echo 'Logs from build' cat "$(pwd)/windows-build.log" From ce6281f281cac971b5ee3b7b761bbfaf4206d7ce Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Thu, 1 Feb 2018 14:31:09 -0500 Subject: [PATCH 024/109] Update .travis.yml --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e4b01e22d..a5c154d56 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,6 @@ install: - "travis_wait 30 sleep 1800 &" - ./update-mapbox-unity-sdk-core.sh - ./scripts/install.sh -- travis_wait 30 mvn install script: - ./scripts/build.sh From 0091b91877f2a5dae7a2038d11c9c89fad421e6d Mon Sep 17 00:00:00 2001 From: Adarsh Pavani Date: Thu, 1 Feb 2018 16:11:59 -0500 Subject: [PATCH 025/109] moving to circle ci --- .circleci/config.yml | 19 +++++++++++++++++++ scripts/build.sh | 13 +++++++++++++ scripts/install.sh | 2 ++ 3 files changed, 34 insertions(+) create mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 000000000..89f05eac7 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,19 @@ +# .circleci/config.yml +version: 2 +jobs: + build-and-test: + macos: + xcode: "9.2.0" + + steps: + - checkout + - run: + name: Unity Build + command: | + echo "Getting this message! Yaay!!!" + +workflows: + version: 2 + build-and-test: + jobs: + - build-and-test \ No newline at end of file diff --git a/scripts/build.sh b/scripts/build.sh index 6de051688..d73a93e59 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -26,9 +26,22 @@ echo "Attempting to build $project for OS X" -stackTraceLogType Full \ -quit +echo "Attempting to build $project for iOS" +/Applications/Unity/Unity.app/Contents/MacOS/Unity \ +-batchmode \ +-nographics \ +-silent -crashes \ +-logFile "$(pwd)/ios-build.log" \ +-projectPath "$(pwd)/${project}" \ +-buildTarget iOS \ +-stackTraceLogType Full \ +-quit + echo 'Logs from build' cat "$(pwd)/windows-build.log" cat "$(pwd)/mac-build.log" +cat "$(pwd)/ios-build.log" + echo 'Attempting to zip builds' zip -r $(pwd)/Build/mac.zip $(pwd)/Build/osx/ diff --git a/scripts/install.sh b/scripts/install.sh index c5be3c69f..28db2acc0 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -30,3 +30,5 @@ install() { install "MacEditorInstaller/Unity-$VERSION.pkg" wait install "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg" +wait +install "MacEditorTargetInstaller/UnitySetup-iOS-Support-for-Editor-$VERSION.pkg" From 9f7b527fcb1f734c7ec6864dcae4529e5bcea10f Mon Sep 17 00:00:00 2001 From: Adarsh Pavani Date: Thu, 1 Feb 2018 16:17:36 -0500 Subject: [PATCH 026/109] .. --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 89f05eac7..a39eae9b6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,6 +12,7 @@ jobs: command: | echo "Getting this message! Yaay!!!" + workflows: version: 2 build-and-test: From 74a9f4a077bcbbfddd082b02119b96c1814f785f Mon Sep 17 00:00:00 2001 From: Adarsh Pavani Date: Thu, 1 Feb 2018 16:40:06 -0500 Subject: [PATCH 027/109] changes to config.yml --- .circleci/config.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a39eae9b6..85136c7ad 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,10 +8,19 @@ jobs: steps: - checkout - run: - name: Unity Build + name: GIT Checkout command: | - echo "Getting this message! Yaay!!!" + ./update-mapbox-unity-sdk-core.sh + - run: + name: Installing Unity + command: | + ./scripts/install.sh + + - run: + name: Building the project + command: | + ./scripts/build.sh workflows: version: 2 From b73e4dc7a87cfd7da1d037a9dd49aebf1a11ec0a Mon Sep 17 00:00:00 2001 From: Adarsh Pavani Date: Thu, 1 Feb 2018 16:40:59 -0500 Subject: [PATCH 028/109] .. --- .circleci/config.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 85136c7ad..949722031 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,12 +11,10 @@ jobs: name: GIT Checkout command: | ./update-mapbox-unity-sdk-core.sh - - run: name: Installing Unity command: | ./scripts/install.sh - - run: name: Building the project command: | From 08c1fe524225eefef88838261612a84104b4b589 Mon Sep 17 00:00:00 2001 From: Adarsh Pavani Date: Thu, 1 Feb 2018 16:42:46 -0500 Subject: [PATCH 029/109] removing the pipe --- .circleci/config.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 949722031..c58b90495 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,16 +9,13 @@ jobs: - checkout - run: name: GIT Checkout - command: | - ./update-mapbox-unity-sdk-core.sh + command: ./update-mapbox-unity-sdk-core.sh - run: name: Installing Unity - command: | - ./scripts/install.sh + command: ./scripts/install.sh - run: name: Building the project - command: | - ./scripts/build.sh + command: ./scripts/build.sh workflows: version: 2 From 4a26008495402e4216ba44f21d02ab6de53db4eb Mon Sep 17 00:00:00 2001 From: Adarsh Pavani Date: Fri, 2 Feb 2018 10:43:56 -0500 Subject: [PATCH 030/109] build script with changes to build.sh --- scripts/build.sh | 2 +- .../MapboxDevTools/Editor/CIBuildScript.cs | 41 +++++++++++++++++++ .../Editor/CIBuildScript.cs.meta | 12 ++++++ 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 sdkproject/Assets/MapboxDevTools/Editor/CIBuildScript.cs create mode 100644 sdkproject/Assets/MapboxDevTools/Editor/CIBuildScript.cs.meta diff --git a/scripts/build.sh b/scripts/build.sh index d73a93e59..b13448faa 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -33,7 +33,7 @@ echo "Attempting to build $project for iOS" -silent -crashes \ -logFile "$(pwd)/ios-build.log" \ -projectPath "$(pwd)/${project}" \ --buildTarget iOS \ +-executeMethod CIBuildScript.BuildForIOS -stackTraceLogType Full \ -quit diff --git a/sdkproject/Assets/MapboxDevTools/Editor/CIBuildScript.cs b/sdkproject/Assets/MapboxDevTools/Editor/CIBuildScript.cs new file mode 100644 index 000000000..23d0fcd63 --- /dev/null +++ b/sdkproject/Assets/MapboxDevTools/Editor/CIBuildScript.cs @@ -0,0 +1,41 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEditor; +using UnityEngine; + +public class CIBuildScript : MonoBehaviour { + + + [MenuItem("Build/Build iOS")] + public static void BuildForIOS() + { + BuildPipeline.BuildPlayer(GetBuildPlayerOptions()); + } + + private static BuildPlayerOptions GetBuildPlayerOptions() + { + BuildPlayerOptions buildPlayerOptions = new BuildPlayerOptions(); + buildPlayerOptions.scenes = new[] + { + "Assets/Mapbox/Main.unity", + "Assets/Mapbox/Examples/1_Explorer/Explorer.unity", + "Assets/Mapbox/Examples/2_LocationProvider/LocationProvider.unity", + "Assets/Mapbox/Examples/3_VoxelMap/VoxelMap.unity", + "Assets/Mapbox/Examples/4_VectorTileMaps/BasicVectorMap/BasicVectorMap.unity", + "Assets/Mapbox/Examples/4_VectorTileMaps/InteractiveStyledVectorMap/InteractiveStyledVectorMap.unity", + "Assets/Mapbox/Examples/4_VectorTileMaps/PoiVectorMap/PoiVectorMap.unity", + "Assets/Mapbox/Examples/4_VectorTileMaps/TerrainVectorMap/TerrainVectorMap.unity", + "Assets/Mapbox/Examples/5_ZoomableMap/ZoomableMap.unity", + "Assets/Mapbox/Examples/6_Globe/Globe.unity", + "Assets/Mapbox/Examples/7_Playground/Scenes/Directions.unity", + "Assets/Mapbox/Examples/7_Playground/Scenes/ForwardGeoCoder.unity", + "Assets/Mapbox/Examples/7_Playground/Scenes/RasterTile.unity", + "Assets/Mapbox/Examples/7_Playground/Scenes/ReverseGeoCoder.unity", + "Assets/Mapbox/Examples/7_Playground/Scenes/VectorTile.unity" + }; + buildPlayerOptions.locationPathName = "../Build/iOSBuild"; + buildPlayerOptions.target = BuildTarget.iOS; + buildPlayerOptions.options = BuildOptions.Il2CPP; + return buildPlayerOptions; + } +} diff --git a/sdkproject/Assets/MapboxDevTools/Editor/CIBuildScript.cs.meta b/sdkproject/Assets/MapboxDevTools/Editor/CIBuildScript.cs.meta new file mode 100644 index 000000000..2708e1462 --- /dev/null +++ b/sdkproject/Assets/MapboxDevTools/Editor/CIBuildScript.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 307499e214e9e44afac69336c6fb21a6 +timeCreated: 1517583546 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From d604c047a6f882832bf7e42a86afe23bdd4f451f Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Mon, 5 Feb 2018 16:09:59 -0800 Subject: [PATCH 031/109] Update build.sh --- scripts/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build.sh b/scripts/build.sh index b13448faa..0ea893c94 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -33,7 +33,7 @@ echo "Attempting to build $project for iOS" -silent -crashes \ -logFile "$(pwd)/ios-build.log" \ -projectPath "$(pwd)/${project}" \ --executeMethod CIBuildScript.BuildForIOS +-executeMethod CIBuildScript.BuildForIOS \ -stackTraceLogType Full \ -quit From 1c7ed5b09e938f500cf9081ce3c517e0e19cee9d Mon Sep 17 00:00:00 2001 From: Adarsh Pavani Date: Thu, 8 Feb 2018 16:58:16 -0800 Subject: [PATCH 032/109] adding appveyor back --- .travis.yml | 14 ------- appveyor.yml | 39 +++++++++++++++++++ .../ScenicMapImageFactory.asset | 4 +- sdkproject/Assets/Materials.meta | 9 +++++ .../ProjectSettings/DynamicsManager.asset | 2 + .../ProjectSettings/Physics2DSettings.asset | 7 +++- sdkproject/ProjectSettings/ProjectVersion.txt | 2 +- 7 files changed, 58 insertions(+), 19 deletions(-) delete mode 100644 .travis.yml create mode 100644 appveyor.yml create mode 100644 sdkproject/Assets/Materials.meta diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index a5c154d56..000000000 --- a/.travis.yml +++ /dev/null @@ -1,14 +0,0 @@ -language: objective-c -sudo: required -os: osx -osx_image: xcode9.2 -rvm: -- 2.2 - -install: -- "travis_wait 30 sleep 1800 &" -- ./update-mapbox-unity-sdk-core.sh -- ./scripts/install.sh - -script: -- ./scripts/build.sh diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 000000000..3cad1c134 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,39 @@ +branches: + except: + - "unity-cloud-build" + - gh-pages + - mb-pages + +image: Visual Studio 2015 + +init: + - git config --global core.autocrlf input + +#don't use 'shallow_clone: true' as we have submodules +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 + +build_script: +#let UnityPackager finish sucessfully, even after encounting errors, eg missing '.meta' files + - SET UNITYPACKAGER_RAISE_ERROR_ON_FAILURE=0 + - SET PATH=%CD%\scriptcs;%PATH% + - SET PATH=%CD%\docfx;%PATH% + - SET PATH=C:\Program Files\7-Zip;%PATH% +#get scriptcs + - powershell -NoProfile -ExecutionPolicy unrestricted -Command "iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/mapbox/mapbox-sdk-cs/master/scripts/get-scriptcs.ps1'))" +#build and publish documentation, create unitypackage + - scriptcs scripts\build.csx + +artifacts: + - path: 'mapbox-unity-sdk_*.unitypackage' + name: UnityPackage + - path: documentation\docfx_project\_site + name: site diff --git a/sdkproject/Assets/Mapbox/Examples/_sharedModules/ScenicMapImageFactory.asset b/sdkproject/Assets/Mapbox/Examples/_sharedModules/ScenicMapImageFactory.asset index 5b411d8af..0f1cee9f3 100644 --- a/sdkproject/Assets/Mapbox/Examples/_sharedModules/ScenicMapImageFactory.asset +++ b/sdkproject/Assets/Mapbox/Examples/_sharedModules/ScenicMapImageFactory.asset @@ -11,13 +11,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2b10536479dade041b6db9893fdf723a, type: 3} m_Name: ScenicMapImageFactory m_EditorClassIdentifier: - _mapIdType: 1 + _mapIdType: 0 _customStyle: Name: Id: mapbox://styles/mapbox/cjavylmncmgeb2rlnpimhp95q Modified: UserName: - _mapId: mapbox://styles/mapbox/cjavylmncmgeb2rlnpimhp95q + _mapId: mapbox://styles/mapbox/streets-v10 _useCompression: 0 _useMipMap: 1 _useRetina: 1 diff --git a/sdkproject/Assets/Materials.meta b/sdkproject/Assets/Materials.meta new file mode 100644 index 000000000..93bc92f0b --- /dev/null +++ b/sdkproject/Assets/Materials.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: e836c5975e22a4706b42845135244877 +folderAsset: yes +timeCreated: 1501256004 +licenseType: Pro +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/sdkproject/ProjectSettings/DynamicsManager.asset b/sdkproject/ProjectSettings/DynamicsManager.asset index 6be69106a..0be3d787c 100644 --- a/sdkproject/ProjectSettings/DynamicsManager.asset +++ b/sdkproject/ProjectSettings/DynamicsManager.asset @@ -16,3 +16,5 @@ PhysicsManager: m_EnableAdaptiveForce: 0 m_EnablePCM: 1 m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff + m_AutoSimulation: 1 + m_AutoSyncTransforms: 1 diff --git a/sdkproject/ProjectSettings/Physics2DSettings.asset b/sdkproject/ProjectSettings/Physics2DSettings.asset index dd4738c2f..132ee6bc8 100644 --- a/sdkproject/ProjectSettings/Physics2DSettings.asset +++ b/sdkproject/ProjectSettings/Physics2DSettings.asset @@ -3,7 +3,7 @@ --- !u!19 &1 Physics2DSettings: m_ObjectHideFlags: 0 - serializedVersion: 2 + serializedVersion: 3 m_Gravity: {x: 0, y: -9.81} m_DefaultMaterial: {fileID: 0} m_VelocityIterations: 8 @@ -13,15 +13,18 @@ Physics2DSettings: m_MaxAngularCorrection: 8 m_MaxTranslationSpeed: 100 m_MaxRotationSpeed: 360 - m_MinPenetrationForPenalty: 0.01 m_BaumgarteScale: 0.2 m_BaumgarteTimeOfImpactScale: 0.75 m_TimeToSleep: 0.5 m_LinearSleepTolerance: 0.01 m_AngularSleepTolerance: 2 + m_DefaultContactOffset: 0.01 + m_AutoSimulation: 1 m_QueriesHitTriggers: 1 m_QueriesStartInColliders: 1 m_ChangeStopsCallbacks: 0 + m_CallbacksOnDisable: 1 + m_AutoSyncTransforms: 1 m_AlwaysShowColliders: 0 m_ShowColliderSleep: 1 m_ShowColliderContacts: 0 diff --git a/sdkproject/ProjectSettings/ProjectVersion.txt b/sdkproject/ProjectSettings/ProjectVersion.txt index e6cd1f978..7a6fffb8b 100644 --- a/sdkproject/ProjectSettings/ProjectVersion.txt +++ b/sdkproject/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2017.3.0f3 +m_EditorVersion: 2017.2.0f3 From bf4ee991e1543c54cc2b4247cde57edb8ce642f5 Mon Sep 17 00:00:00 2001 From: Adarsh Pavani Date: Thu, 8 Feb 2018 18:34:51 -0800 Subject: [PATCH 033/109] adding back travis to build docs only --- .travis.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..24999c833 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,17 @@ +git: + submodules: false + +env: + global: + - TERM: dumb + # Access token. + - secure: EryHh1gSsheLZcW/dnxGRwvVDRiJDgsGp13ylgve55wvatqM+H8toDFY70PwLW03YbJIHEjQCVraDxuc0dFtQfS7fMr7rUc9fgtxQapbQ1CAfpXe8FaSN4JbIRnqSnMq2dN1dpwRRVFIuW2H1axpfTFZ2NBVk7Y63HCrC2AUJLFb1O0EIr/R5G5FHzyQ7lAM7/ycuEdchso+XIi6uzPIBAUIR9H1si64+GzVpYskHhd83TSvo60AxVA7+BiwfrUKVfRo8HkJhvTMrVfLRcFnQK6TCYrvLXj8n5dJtfWgItRG5VLAe8gbjdXiC9uY14qP6WmRKCCEcYsTZWlVX5BCskrVVFS38V1uNFVRCaIeEKC00eDFyBn0+8HgXWB2yLHJWykm05zZGJ/Jg3anEM166bcHuT8BTK0E0V6C9lO+IpXO0jzh3YDe2xJW65uUl82oL955QniNml2Xijb+MiQCCcTKof2iRD4hSbnNWbLKa8xVFe2q22f7ihsJBxXAvh3jHaBmrYCQFFWRj6O+xM2pFFCnH2o32b45rhcqMpIKA5kkWbcWUcKXJhaDx46oT4+cEw+tCghtV0ehbwelLgTA9Za1Cs5voa8Pc1brYOEhv97WZQ5KNt0UGCkwj1DxXvlGpYCyAF36hkBv9me67ADNzTQa+udKwT156wULPMQBacY= + +language: + - csharp + +mono: + - latest + +script: + - ./scripts/build-docs.sh \ No newline at end of file From 0558144f85ef6eae22a1a9c50a3fabdbbd5ad709 Mon Sep 17 00:00:00 2001 From: Adarsh Pavani Date: Thu, 8 Feb 2018 18:45:11 -0800 Subject: [PATCH 034/109] removing junk --- config.travis.yml | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 config.travis.yml diff --git a/config.travis.yml b/config.travis.yml deleted file mode 100644 index 53c177227..000000000 --- a/config.travis.yml +++ /dev/null @@ -1,10 +0,0 @@ -language: C# -osx_image: xcode9.1 -rvm: -- 2.2 -before_install: -- chmod a+x ./update-mapbox-unity-sdk-core.sh -install: -- ./scripts/install.sh -script: -- ./scripts/build.sh \ No newline at end of file From d3a23bf7091169d2a9c6f98d774dca460decf71b Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Fri, 9 Feb 2018 17:34:22 -0800 Subject: [PATCH 035/109] Update install.sh --- scripts/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install.sh b/scripts/install.sh index 28db2acc0..f5f2030b3 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -6,7 +6,7 @@ df -h BASE_URL=https://download.unity3d.com/download_unity HASH=472613c02cf7 -VERSION=2017.1.0f3 +VERSION=$1 download() { file=$1 From d6e652425b0780084ad6fffdf757a59fdfb6b46f Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Fri, 9 Feb 2018 17:49:35 -0800 Subject: [PATCH 036/109] Update config.yml --- .circleci/config.yml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c58b90495..5a2878337 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,5 +1,9 @@ # .circleci/config.yml version: 2 +machine: + environment: + HASH:472613c02cf7 + UNITY_VERSION:2017.1.0f3 jobs: build-and-test: macos: @@ -9,10 +13,17 @@ jobs: - checkout - run: name: GIT Checkout - command: ./update-mapbox-unity-sdk-core.sh + command: ./update-mapbox-unity-sdk-core.sh ${HASH} ${UNITY_VERSION} - run: name: Installing Unity command: ./scripts/install.sh + - save_cache: + key: unity-installer-cache + paths: + - Unity-${UNITY_VERSION}.pkg + - UnitySetup-Windows-Support-for-Editor-${UNITY_VERSION}.pkg + - UnitySetup-iOS-Support-for-Editor-${UNITY_VERSION}.pkg + - run: name: Building the project command: ./scripts/build.sh @@ -21,4 +32,4 @@ workflows: version: 2 build-and-test: jobs: - - build-and-test \ No newline at end of file + - build-and-test From 8b3a71daec79eb4180075e3c553ccb2c2d6f29be Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Fri, 9 Feb 2018 17:49:42 -0800 Subject: [PATCH 037/109] Update install.sh --- scripts/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index f5f2030b3..9cf9426ce 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -5,8 +5,8 @@ set -eu df -h BASE_URL=https://download.unity3d.com/download_unity -HASH=472613c02cf7 -VERSION=$1 +HASH=$1 +VERSION=$2 download() { file=$1 From 349c4af02369559d286cf8a36bb5d52740e2a9dc Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Fri, 9 Feb 2018 17:57:12 -0800 Subject: [PATCH 038/109] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5a2878337..503965087 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,7 +13,7 @@ jobs: - checkout - run: name: GIT Checkout - command: ./update-mapbox-unity-sdk-core.sh ${HASH} ${UNITY_VERSION} + command: echo "${HASH} ${UNITY_VERSION}" - run: name: Installing Unity command: ./scripts/install.sh From cd4c17a72821a79085ecfdae5d18f9a99cfd70dd Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Fri, 9 Feb 2018 17:58:32 -0800 Subject: [PATCH 039/109] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 503965087..5a2878337 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,7 +13,7 @@ jobs: - checkout - run: name: GIT Checkout - command: echo "${HASH} ${UNITY_VERSION}" + command: ./update-mapbox-unity-sdk-core.sh ${HASH} ${UNITY_VERSION} - run: name: Installing Unity command: ./scripts/install.sh From 427224422095122959dc3885cea55e94f8601040 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Fri, 9 Feb 2018 18:00:41 -0800 Subject: [PATCH 040/109] Update config.yml --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5a2878337..b6ec0e919 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,8 +2,8 @@ version: 2 machine: environment: - HASH:472613c02cf7 - UNITY_VERSION:2017.1.0f3 + HASH:"472613c02cf7" + UNITY_VERSION:"2017.1.0f3" jobs: build-and-test: macos: From bf128380a38ac244064a57ad23d36b3ffba34100 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Fri, 9 Feb 2018 18:05:57 -0800 Subject: [PATCH 041/109] Update config.yml --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b6ec0e919..a5c505f34 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,10 +13,10 @@ jobs: - checkout - run: name: GIT Checkout - command: ./update-mapbox-unity-sdk-core.sh ${HASH} ${UNITY_VERSION} + command: ./update-mapbox-unity-sdk-core.sh - run: name: Installing Unity - command: ./scripts/install.sh + command: ./scripts/install.sh ${HASH} ${UNITY_VERSION} - save_cache: key: unity-installer-cache paths: From dc3c17f81e1598654604f9a8b1ebdd0517bbc957 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Fri, 9 Feb 2018 18:13:20 -0800 Subject: [PATCH 042/109] Update config.yml --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a5c505f34..580d9a64b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,8 +2,8 @@ version: 2 machine: environment: - HASH:"472613c02cf7" - UNITY_VERSION:"2017.1.0f3" + HASH:472613c02cf7 + UNITY_VERSION:2017.1.0f3 jobs: build-and-test: macos: @@ -16,7 +16,7 @@ jobs: command: ./update-mapbox-unity-sdk-core.sh - run: name: Installing Unity - command: ./scripts/install.sh ${HASH} ${UNITY_VERSION} + command: ./scripts/install.sh "${HASH}" "${UNITY_VERSION}" - save_cache: key: unity-installer-cache paths: From e9359499107900b9f76fca44030e7a8798cac32e Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Fri, 9 Feb 2018 18:17:43 -0800 Subject: [PATCH 043/109] Update config.yml --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 580d9a64b..d86641a18 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,8 +2,8 @@ version: 2 machine: environment: - HASH:472613c02cf7 - UNITY_VERSION:2017.1.0f3 + hash:472613c02cf7 + unity_version:2017.1.0f3 jobs: build-and-test: macos: @@ -16,13 +16,13 @@ jobs: command: ./update-mapbox-unity-sdk-core.sh - run: name: Installing Unity - command: ./scripts/install.sh "${HASH}" "${UNITY_VERSION}" + command: ./scripts/install.sh ${hash} ${unity_version} - save_cache: key: unity-installer-cache paths: - - Unity-${UNITY_VERSION}.pkg - - UnitySetup-Windows-Support-for-Editor-${UNITY_VERSION}.pkg - - UnitySetup-iOS-Support-for-Editor-${UNITY_VERSION}.pkg + - Unity-${unity_version}.pkg + - UnitySetup-Windows-Support-for-Editor-${unity_version}.pkg + - UnitySetup-iOS-Support-for-Editor-${unity_version}.pkg - run: name: Building the project From b1e5e302b0b3afd4c42c86de5f709ee46be168c7 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Fri, 9 Feb 2018 18:19:47 -0800 Subject: [PATCH 044/109] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d86641a18..7af6c3baa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,7 @@ jobs: command: ./update-mapbox-unity-sdk-core.sh - run: name: Installing Unity - command: ./scripts/install.sh ${hash} ${unity_version} + command: ./scripts/install.sh $hash $unity_version - save_cache: key: unity-installer-cache paths: From 73120d6d5b560a781abcf8469e6594a753a143f6 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Fri, 9 Feb 2018 18:32:15 -0800 Subject: [PATCH 045/109] Update config.yml --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7af6c3baa..d9ccf171b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,8 +2,8 @@ version: 2 machine: environment: - hash:472613c02cf7 - unity_version:2017.1.0f3 + hash: 472613c02cf7 + unity_version: 2017.1.0f3 jobs: build-and-test: macos: From 45b1338c8461e52aa46dc53371ba8d6efcb8db1e Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Fri, 9 Feb 2018 18:34:26 -0800 Subject: [PATCH 046/109] Update config.yml --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d9ccf171b..afc5979ec 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,8 +2,8 @@ version: 2 machine: environment: - hash: 472613c02cf7 - unity_version: 2017.1.0f3 + HASH: 472613c02cf7 + UNITY_VERSION: 2017.1.0f3 jobs: build-and-test: macos: @@ -16,13 +16,13 @@ jobs: command: ./update-mapbox-unity-sdk-core.sh - run: name: Installing Unity - command: ./scripts/install.sh $hash $unity_version + command: ./scripts/install.sh ${HASH} ${UNITY_VERSION} - save_cache: key: unity-installer-cache paths: - - Unity-${unity_version}.pkg - - UnitySetup-Windows-Support-for-Editor-${unity_version}.pkg - - UnitySetup-iOS-Support-for-Editor-${unity_version}.pkg + - Unity-${UNITY_VERSION}.pkg + - UnitySetup-Windows-Support-for-Editor-${UNITY_VERSION}.pkg + - UnitySetup-iOS-Support-for-Editor-${UNITY_VERSION}.pkg - run: name: Building the project From 80ad47b299c3fabe0118a06f3fd25885e202ec57 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Fri, 9 Feb 2018 18:35:58 -0800 Subject: [PATCH 047/109] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index afc5979ec..c0b5f2a6a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,7 @@ jobs: command: ./update-mapbox-unity-sdk-core.sh - run: name: Installing Unity - command: ./scripts/install.sh ${HASH} ${UNITY_VERSION} + command: echo "${HASH}" - save_cache: key: unity-installer-cache paths: From a57eb5ff0e97516aa30b9a59dd8b4eab98a7cb0e Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Fri, 9 Feb 2018 18:43:14 -0800 Subject: [PATCH 048/109] Update config.yml --- .circleci/config.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c0b5f2a6a..6f8ca0ac7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,9 +1,5 @@ # .circleci/config.yml version: 2 -machine: - environment: - HASH: 472613c02cf7 - UNITY_VERSION: 2017.1.0f3 jobs: build-and-test: macos: @@ -14,9 +10,16 @@ jobs: - run: name: GIT Checkout command: ./update-mapbox-unity-sdk-core.sh + - run: + name: Setting HASH + command: HASH=472613c02cf7 + - run: + name: Setting UNITY_VERSION + command: UNITY_VERSION: 2017.1.0f3 - run: name: Installing Unity - command: echo "${HASH}" + command: ./scripts/install.sh ${HASH} ${UNITY_VERSION} + - save_cache: key: unity-installer-cache paths: From efa5d5b5f7817bd708a86a54fb85f5063d71d597 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Fri, 9 Feb 2018 18:47:58 -0800 Subject: [PATCH 049/109] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6f8ca0ac7..898e3d6e9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,7 +15,7 @@ jobs: command: HASH=472613c02cf7 - run: name: Setting UNITY_VERSION - command: UNITY_VERSION: 2017.1.0f3 + command: UNITY_VERSION=2017.1.0f3 - run: name: Installing Unity command: ./scripts/install.sh ${HASH} ${UNITY_VERSION} From 043425dae1e83d17918247a5d87d745a23b3e6bf Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Fri, 9 Feb 2018 18:51:23 -0800 Subject: [PATCH 050/109] Update config.yml --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 898e3d6e9..5e802fbb5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,10 +12,10 @@ jobs: command: ./update-mapbox-unity-sdk-core.sh - run: name: Setting HASH - command: HASH=472613c02cf7 + command: export HASH=472613c02cf7 - run: name: Setting UNITY_VERSION - command: UNITY_VERSION=2017.1.0f3 + command: export UNITY_VERSION=2017.1.0f3 - run: name: Installing Unity command: ./scripts/install.sh ${HASH} ${UNITY_VERSION} From 34032107ee209c953db5f3ef34337c4f42f57b45 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Fri, 9 Feb 2018 18:56:06 -0800 Subject: [PATCH 051/109] Update config.yml --- .circleci/config.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5e802fbb5..4e4b24e3d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,9 +13,15 @@ jobs: - run: name: Setting HASH command: export HASH=472613c02cf7 + - run: + name: Read HASH + command: echo ${HASH} - run: name: Setting UNITY_VERSION command: export UNITY_VERSION=2017.1.0f3 + - run: + name: Read UNITY_VERSION + command: echo $UNITY_VERSION - run: name: Installing Unity command: ./scripts/install.sh ${HASH} ${UNITY_VERSION} From 6b3600a155ab92faa43216a8faab89c384d530cc Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Fri, 9 Feb 2018 19:07:07 -0800 Subject: [PATCH 052/109] Update config.yml --- .circleci/config.yml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4e4b24e3d..2be02d58a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,18 +10,10 @@ jobs: - run: name: GIT Checkout command: ./update-mapbox-unity-sdk-core.sh - - run: - name: Setting HASH - command: export HASH=472613c02cf7 - - run: - name: Read HASH - command: echo ${HASH} - - run: - name: Setting UNITY_VERSION - command: export UNITY_VERSION=2017.1.0f3 - - run: - name: Read UNITY_VERSION - command: echo $UNITY_VERSION + - run: export HASH="472613c02cf7" + - run: echo ${HASH} + - run: export UNITY_VERSION="2017.1.0f3" + - run: echo $UNITY_VERSION - run: name: Installing Unity command: ./scripts/install.sh ${HASH} ${UNITY_VERSION} From fd86fcedd4824927d0bb461c1847c75553187ea9 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Fri, 9 Feb 2018 19:26:24 -0800 Subject: [PATCH 053/109] Update config.yml --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2be02d58a..9d576f6fb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,9 +10,9 @@ jobs: - run: name: GIT Checkout command: ./update-mapbox-unity-sdk-core.sh - - run: export HASH="472613c02cf7" + - run: export HASH="472613c02cf7" >> $BASH_ENV - run: echo ${HASH} - - run: export UNITY_VERSION="2017.1.0f3" + - run: export UNITY_VERSION="2017.1.0f3" >> $BASH_ENV - run: echo $UNITY_VERSION - run: name: Installing Unity From aad2e500d49d39745924f8ffda393caa48b84f5e Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Fri, 9 Feb 2018 19:34:39 -0800 Subject: [PATCH 054/109] Update config.yml --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9d576f6fb..f854bff72 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,9 +10,9 @@ jobs: - run: name: GIT Checkout command: ./update-mapbox-unity-sdk-core.sh - - run: export HASH="472613c02cf7" >> $BASH_ENV + - run: echo 'export HASH="472613c02cf7"' >> $BASH_ENV - run: echo ${HASH} - - run: export UNITY_VERSION="2017.1.0f3" >> $BASH_ENV + - run: echo 'export UNITY_VERSION="2017.1.0f3"' >> $BASH_ENV - run: echo $UNITY_VERSION - run: name: Installing Unity From d73621b268c668b0fff24ac5ba4d191ec951acbc Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Fri, 9 Feb 2018 22:48:13 -0800 Subject: [PATCH 055/109] Update config.yml --- .circleci/config.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f854bff72..64d89c446 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,20 +6,24 @@ jobs: xcode: "9.2.0" steps: - - checkout - - run: - name: GIT Checkout - command: ./update-mapbox-unity-sdk-core.sh - run: echo 'export HASH="472613c02cf7"' >> $BASH_ENV - run: echo ${HASH} - run: echo 'export UNITY_VERSION="2017.1.0f3"' >> $BASH_ENV - run: echo $UNITY_VERSION + - restore_cache: + keys: unity-installer-cache-999 + + - checkout + - run: + name: GIT Checkout + command: ./update-mapbox-unity-sdk-core.sh + - run: name: Installing Unity command: ./scripts/install.sh ${HASH} ${UNITY_VERSION} - save_cache: - key: unity-installer-cache + key: unity-installer-cache-999 paths: - Unity-${UNITY_VERSION}.pkg - UnitySetup-Windows-Support-for-Editor-${UNITY_VERSION}.pkg From 93759dfe765ee1aefa5d9702c4461aab470569ef Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Fri, 9 Feb 2018 23:00:53 -0800 Subject: [PATCH 056/109] Update config.yml --- .circleci/config.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 64d89c446..0acfa3fcd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,14 +4,18 @@ jobs: build-and-test: macos: xcode: "9.2.0" + + environment: + - unityversion: 2017.1.0f3 + - hashvalue: 472613c02cf7 steps: - - run: echo 'export HASH="472613c02cf7"' >> $BASH_ENV + - run: echo 'export HASH="$unityversion"' >> $BASH_ENV - run: echo ${HASH} - - run: echo 'export UNITY_VERSION="2017.1.0f3"' >> $BASH_ENV + - run: echo 'export UNITY_VERSION="$hashvalue"' >> $BASH_ENV - run: echo $UNITY_VERSION - restore_cache: - keys: unity-installer-cache-999 + keys: unity-installer-cache-991 - checkout - run: @@ -23,7 +27,7 @@ jobs: command: ./scripts/install.sh ${HASH} ${UNITY_VERSION} - save_cache: - key: unity-installer-cache-999 + key: unity-installer-cache-991 paths: - Unity-${UNITY_VERSION}.pkg - UnitySetup-Windows-Support-for-Editor-${UNITY_VERSION}.pkg From 1faf2a5370a93904ec9fa658d2d4c32e9f11762d Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Fri, 9 Feb 2018 23:02:59 -0800 Subject: [PATCH 057/109] Update config.yml --- .circleci/config.yml | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0acfa3fcd..e6632f5c7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,16 +6,12 @@ jobs: xcode: "9.2.0" environment: - - unityversion: 2017.1.0f3 - - hashvalue: 472613c02cf7 + - UNITYVERSION: 2017.1.0f3 + - HASH: 472613c02cf7 steps: - - run: echo 'export HASH="$unityversion"' >> $BASH_ENV - - run: echo ${HASH} - - run: echo 'export UNITY_VERSION="$hashvalue"' >> $BASH_ENV - - run: echo $UNITY_VERSION - restore_cache: - keys: unity-installer-cache-991 + keys: unity-installer-cache-995 - checkout - run: @@ -24,14 +20,14 @@ jobs: - run: name: Installing Unity - command: ./scripts/install.sh ${HASH} ${UNITY_VERSION} + command: ./scripts/install.sh ${HASH} ${UNITYVERSION} - save_cache: - key: unity-installer-cache-991 + key: unity-installer-cache-995 paths: - - Unity-${UNITY_VERSION}.pkg - - UnitySetup-Windows-Support-for-Editor-${UNITY_VERSION}.pkg - - UnitySetup-iOS-Support-for-Editor-${UNITY_VERSION}.pkg + - Unity-${UNITYVERSION}.pkg + - UnitySetup-Windows-Support-for-Editor-${UNITYVERSION}.pkg + - UnitySetup-iOS-Support-for-Editor-${UNITYVERSION}.pkg - run: name: Building the project From 1ac4bda91b2b10fc461af3e75fe6604f2d7915fe Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Fri, 9 Feb 2018 23:15:25 -0800 Subject: [PATCH 058/109] Update config.yml --- .circleci/config.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e6632f5c7..635f63a56 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,7 +11,7 @@ jobs: steps: - restore_cache: - keys: unity-installer-cache-995 + keys: unity-installer-cache-996 - checkout - run: @@ -23,15 +23,13 @@ jobs: command: ./scripts/install.sh ${HASH} ${UNITYVERSION} - save_cache: - key: unity-installer-cache-995 + key: unity-installer-cache-996 paths: - - Unity-${UNITYVERSION}.pkg - - UnitySetup-Windows-Support-for-Editor-${UNITYVERSION}.pkg - - UnitySetup-iOS-Support-for-Editor-${UNITYVERSION}.pkg + - Unity-{{"${UNITYVERSION}"}}.pkg + - UnitySetup-Windows-Support-for-Editor-{{"${UNITYVERSION}"}}.pkg + - UnitySetup-iOS-Support-for-Editor-{{"${UNITYVERSION}"}}.pkg - - run: - name: Building the project - command: ./scripts/build.sh + workflows: version: 2 From 3e30ba46f49c7eaa3fc7b692ac1688028b3e2871 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Fri, 9 Feb 2018 23:19:12 -0800 Subject: [PATCH 059/109] Update config.yml --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 635f63a56..ae4cb2367 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,9 +25,9 @@ jobs: - save_cache: key: unity-installer-cache-996 paths: - - Unity-{{"${UNITYVERSION}"}}.pkg - - UnitySetup-Windows-Support-for-Editor-{{"${UNITYVERSION}"}}.pkg - - UnitySetup-iOS-Support-for-Editor-{{"${UNITYVERSION}"}}.pkg + - Unity-{{ "${UNITYVERSION}" }}.pkg + - UnitySetup-Windows-Support-for-Editor-{{ "${UNITYVERSION}" }}.pkg + - UnitySetup-iOS-Support-for-Editor-{{ "${UNITYVERSION}" }}.pkg From 32c7cd3d534529305a170d28146dbc472f89d26b Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Fri, 9 Feb 2018 23:21:50 -0800 Subject: [PATCH 060/109] Update config.yml --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ae4cb2367..e26e2d7f2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,7 +11,7 @@ jobs: steps: - restore_cache: - keys: unity-installer-cache-996 + keys: unity-installer-cache-997 - checkout - run: @@ -23,7 +23,7 @@ jobs: command: ./scripts/install.sh ${HASH} ${UNITYVERSION} - save_cache: - key: unity-installer-cache-996 + key: unity-installer-cache-997 paths: - Unity-{{ "${UNITYVERSION}" }}.pkg - UnitySetup-Windows-Support-for-Editor-{{ "${UNITYVERSION}" }}.pkg From 645e7402b84e8bde26ffd785f27f82b6732fed7b Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Fri, 9 Feb 2018 23:26:02 -0800 Subject: [PATCH 061/109] Update config.yml --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e26e2d7f2..d763d920e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,9 +25,9 @@ jobs: - save_cache: key: unity-installer-cache-997 paths: - - Unity-{{ "${UNITYVERSION}" }}.pkg - - UnitySetup-Windows-Support-for-Editor-{{ "${UNITYVERSION}" }}.pkg - - UnitySetup-iOS-Support-for-Editor-{{ "${UNITYVERSION}" }}.pkg + - Unity-{{ .Environment.UNITYVERSION }}.pkg + - UnitySetup-Windows-Support-for-Editor-{{ .Environment.UNITYVERSION }}.pkg + - UnitySetup-iOS-Support-for-Editor-{{ .Environment.UNITYVERSION }}.pkg From 627bfa23d80547e22753fa23f809e2f788b7b0cd Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Fri, 9 Feb 2018 23:27:15 -0800 Subject: [PATCH 062/109] Update config.yml --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d763d920e..9fd5026de 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,7 +11,7 @@ jobs: steps: - restore_cache: - keys: unity-installer-cache-997 + keys: unity-installer-cache-998 - checkout - run: @@ -23,7 +23,7 @@ jobs: command: ./scripts/install.sh ${HASH} ${UNITYVERSION} - save_cache: - key: unity-installer-cache-997 + key: unity-installer-cache-998 paths: - Unity-{{ .Environment.UNITYVERSION }}.pkg - UnitySetup-Windows-Support-for-Editor-{{ .Environment.UNITYVERSION }}.pkg From ae2b587e751fa5e892d43de81dc0995db4ce2874 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Fri, 9 Feb 2018 23:46:15 -0800 Subject: [PATCH 063/109] Update config.yml --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9fd5026de..5f7f25431 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,9 +25,9 @@ jobs: - save_cache: key: unity-installer-cache-998 paths: - - Unity-{{ .Environment.UNITYVERSION }}.pkg - - UnitySetup-Windows-Support-for-Editor-{{ .Environment.UNITYVERSION }}.pkg - - UnitySetup-iOS-Support-for-Editor-{{ .Environment.UNITYVERSION }}.pkg + - Unity-$UNITYVERSION.pkg + - UnitySetup-Windows-Support-for-Editor-$UNITYVERSION.pkg + - UnitySetup-iOS-Support-for-Editor-$UNITYVERSION.pkg From 65d29a2c0bbeb10eec9f80240da8d5595e3912de Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Fri, 9 Feb 2018 23:46:35 -0800 Subject: [PATCH 064/109] Update config.yml --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5f7f25431..c0f3b5d8f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,7 +11,7 @@ jobs: steps: - restore_cache: - keys: unity-installer-cache-998 + keys: unity-installer-cache-992 - checkout - run: @@ -23,7 +23,7 @@ jobs: command: ./scripts/install.sh ${HASH} ${UNITYVERSION} - save_cache: - key: unity-installer-cache-998 + key: unity-installer-cache-992 paths: - Unity-$UNITYVERSION.pkg - UnitySetup-Windows-Support-for-Editor-$UNITYVERSION.pkg From 2012d1a33e57eff4957d4e3a107be696e0107d36 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Sat, 10 Feb 2018 00:02:50 -0800 Subject: [PATCH 065/109] Update config.yml --- .circleci/config.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c0f3b5d8f..bfa60abb4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,7 +11,7 @@ jobs: steps: - restore_cache: - keys: unity-installer-cache-992 + keys: unity-installer-cache-989 - checkout - run: @@ -21,14 +21,18 @@ jobs: - run: name: Installing Unity command: ./scripts/install.sh ${HASH} ${UNITYVERSION} + + - run: + name: Renaming Files + command: mv Unity-${UNITYVERSION}.pkg Unity-Mac.pkg | mv UnitySetup-Windows-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-Windows-Support-for-Editor.pkg | mv UnitySetup-iOS-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-iOS-Support-for-Editor.pkg - save_cache: - key: unity-installer-cache-992 + key: unity-installer-cache-989 paths: - - Unity-$UNITYVERSION.pkg - - UnitySetup-Windows-Support-for-Editor-$UNITYVERSION.pkg - - UnitySetup-iOS-Support-for-Editor-$UNITYVERSION.pkg - + - Unity-Mac.pkg + - UnitySetup-Windows-Support-for-Editor.pkg + - UnitySetup-iOS-Support-for-Editor.pkg + workflows: From c8e49dddba7339da8c507b144c7e6cec88e5420d Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Sat, 10 Feb 2018 00:09:16 -0800 Subject: [PATCH 066/109] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bfa60abb4..3903d7c4b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,7 +24,7 @@ jobs: - run: name: Renaming Files - command: mv Unity-${UNITYVERSION}.pkg Unity-Mac.pkg | mv UnitySetup-Windows-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-Windows-Support-for-Editor.pkg | mv UnitySetup-iOS-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-iOS-Support-for-Editor.pkg + command: mv Unity-${UNITYVERSION}.pkg Unity-Mac.pkg && mv UnitySetup-Windows-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-Windows-Support-for-Editor.pkg && mv UnitySetup-iOS-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-iOS-Support-for-Editor.pkg - save_cache: key: unity-installer-cache-989 From 0fbab77e7c815ac790735dce94e48150bf980ba0 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Sat, 10 Feb 2018 00:19:08 -0800 Subject: [PATCH 067/109] Update config.yml --- .circleci/config.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3903d7c4b..2f1349917 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,28 +11,27 @@ jobs: steps: - restore_cache: - keys: unity-installer-cache-989 - + keys: unity-installer-cache-988 - checkout - run: name: GIT Checkout command: ./update-mapbox-unity-sdk-core.sh - - run: name: Installing Unity command: ./scripts/install.sh ${HASH} ${UNITYVERSION} - - run: name: Renaming Files command: mv Unity-${UNITYVERSION}.pkg Unity-Mac.pkg && mv UnitySetup-Windows-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-Windows-Support-for-Editor.pkg && mv UnitySetup-iOS-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-iOS-Support-for-Editor.pkg - save_cache: - key: unity-installer-cache-989 + key: unity-installer-cache-988 paths: - Unity-Mac.pkg - UnitySetup-Windows-Support-for-Editor.pkg - UnitySetup-iOS-Support-for-Editor.pkg - + - run: + name: Building the project + command: ./scripts/build.sh workflows: From 61598155040bcf87cec4f69e168d159386487408 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Sat, 10 Feb 2018 00:27:16 -0800 Subject: [PATCH 068/109] tetw test --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2f1349917..be19e1cbb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -33,7 +33,6 @@ jobs: name: Building the project command: ./scripts/build.sh - workflows: version: 2 build-and-test: From 4957102b17b6074e2e050c02381553cbfbd2c65e Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Sat, 10 Feb 2018 00:32:13 -0800 Subject: [PATCH 069/109] Update config.yml --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index be19e1cbb..9a598c140 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,6 +5,7 @@ jobs: macos: xcode: "9.2.0" + working_directory: ~/tmp environment: - UNITYVERSION: 2017.1.0f3 - HASH: 472613c02cf7 From c7545ecb5e5cda8b6ef07797a420928fef02e6fc Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Sat, 10 Feb 2018 01:00:18 -0800 Subject: [PATCH 070/109] Update install.sh --- scripts/install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index 9cf9426ce..4df4e7e5d 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -27,8 +27,8 @@ install() { # See $BASE_URL/$HASH/unity-$VERSION-$PLATFORM.ini for complete list # of available packages, where PLATFORM is `osx` or `win` -install "MacEditorInstaller/Unity-$VERSION.pkg" +if[ ! -f "$Unity-Mac.pkg"]; then install "MacEditorInstaller/Unity-$VERSION.pkg" fi wait -install "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg" +if[ ! -f "UnitySetup-Windows-Support-for-Editor.pkg"]; then install "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg" fi wait -install "MacEditorTargetInstaller/UnitySetup-iOS-Support-for-Editor-$VERSION.pkg" +if [ ! -f "UnitySetup-iOS-Support-for-Editor.pkg"]; then install "MacEditorTargetInstaller/UnitySetup-iOS-Support-for-Editor-$VERSION.pkg" fi From f8e6c998fc47c97887be4b39a916963970015eae Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Sun, 11 Feb 2018 23:55:58 -0800 Subject: [PATCH 071/109] Update install.sh --- scripts/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index 4df4e7e5d..a2582ba02 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -29,6 +29,6 @@ install() { if[ ! -f "$Unity-Mac.pkg"]; then install "MacEditorInstaller/Unity-$VERSION.pkg" fi wait -if[ ! -f "UnitySetup-Windows-Support-for-Editor.pkg"]; then install "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg" fi +if[ ! -f "UnitySetup-Windows-Support-for-Editor.pkg"]; then install "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg"; fi wait -if [ ! -f "UnitySetup-iOS-Support-for-Editor.pkg"]; then install "MacEditorTargetInstaller/UnitySetup-iOS-Support-for-Editor-$VERSION.pkg" fi +if [ ! -f "UnitySetup-iOS-Support-for-Editor.pkg"]; then install "MacEditorTargetInstaller/UnitySetup-iOS-Support-for-Editor-$VERSION.pkg"; fi From d95a9c2d00f89b8265606f025dd6fa72b0a72462 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Sun, 11 Feb 2018 23:56:14 -0800 Subject: [PATCH 072/109] Update install.sh --- scripts/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install.sh b/scripts/install.sh index a2582ba02..a665104b4 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -27,7 +27,7 @@ install() { # See $BASE_URL/$HASH/unity-$VERSION-$PLATFORM.ini for complete list # of available packages, where PLATFORM is `osx` or `win` -if[ ! -f "$Unity-Mac.pkg"]; then install "MacEditorInstaller/Unity-$VERSION.pkg" fi +if[ ! -f "$Unity-Mac.pkg"]; then install "MacEditorInstaller/Unity-$VERSION.pkg"; fi wait if[ ! -f "UnitySetup-Windows-Support-for-Editor.pkg"]; then install "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg"; fi wait From 8d98a725869dfcd28359c740b9f8f9e5c3b05f25 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Mon, 12 Feb 2018 00:02:01 -0800 Subject: [PATCH 073/109] Update install.sh --- scripts/install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index a665104b4..80528d108 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -27,8 +27,8 @@ install() { # See $BASE_URL/$HASH/unity-$VERSION-$PLATFORM.ini for complete list # of available packages, where PLATFORM is `osx` or `win` -if[ ! -f "$Unity-Mac.pkg"]; then install "MacEditorInstaller/Unity-$VERSION.pkg"; fi +if[ ! -f "Unity-Mac.pkg" ]; then install "MacEditorInstaller/Unity-$VERSION.pkg"; fi wait -if[ ! -f "UnitySetup-Windows-Support-for-Editor.pkg"]; then install "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg"; fi +if[ ! -f "UnitySetup-Windows-Support-for-Editor.pkg" ]; then install "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg"; fi wait -if [ ! -f "UnitySetup-iOS-Support-for-Editor.pkg"]; then install "MacEditorTargetInstaller/UnitySetup-iOS-Support-for-Editor-$VERSION.pkg"; fi +if [ ! -f "UnitySetup-iOS-Support-for-Editor.pkg" ]; then install "MacEditorTargetInstaller/UnitySetup-iOS-Support-for-Editor-$VERSION.pkg"; fi From e3f2800ea8b399e1305ae2d1e40b21ec88e45ffd Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Mon, 12 Feb 2018 00:08:23 -0800 Subject: [PATCH 074/109] Update install.sh --- scripts/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index 80528d108..8bbde3094 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -27,8 +27,8 @@ install() { # See $BASE_URL/$HASH/unity-$VERSION-$PLATFORM.ini for complete list # of available packages, where PLATFORM is `osx` or `win` -if[ ! -f "Unity-Mac.pkg" ]; then install "MacEditorInstaller/Unity-$VERSION.pkg"; fi +if [ ! -f "Unity-Mac.pkg" ]; then install "MacEditorInstaller/Unity-$VERSION.pkg"; fi wait -if[ ! -f "UnitySetup-Windows-Support-for-Editor.pkg" ]; then install "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg"; fi +if [ ! -f "UnitySetup-Windows-Support-for-Editor.pkg" ]; then install "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg"; fi wait if [ ! -f "UnitySetup-iOS-Support-for-Editor.pkg" ]; then install "MacEditorTargetInstaller/UnitySetup-iOS-Support-for-Editor-$VERSION.pkg"; fi From d03688cb141230809003d48f8204b4317b994a07 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Mon, 12 Feb 2018 00:35:40 -0800 Subject: [PATCH 075/109] Update install.sh --- scripts/install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index 8bbde3094..756816877 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -27,8 +27,8 @@ install() { # See $BASE_URL/$HASH/unity-$VERSION-$PLATFORM.ini for complete list # of available packages, where PLATFORM is `osx` or `win` -if [ ! -f "Unity-Mac.pkg" ]; then install "MacEditorInstaller/Unity-$VERSION.pkg"; fi +if [ ! -f "Unity-Mac.pkg" ]; then install "Unity-Mac.pkg"; else install "MacEditorInstaller/Unity-$VERSION.pkg"; fi wait -if [ ! -f "UnitySetup-Windows-Support-for-Editor.pkg" ]; then install "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg"; fi +if [ ! -f "UnitySetup-Windows-Support-for-Editor.pkg" ]; then install "UnitySetup-Windows-Support-for-Editor.pkg"; else install "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg"; fi wait -if [ ! -f "UnitySetup-iOS-Support-for-Editor.pkg" ]; then install "MacEditorTargetInstaller/UnitySetup-iOS-Support-for-Editor-$VERSION.pkg"; fi +if [ ! -f "UnitySetup-iOS-Support-for-Editor.pkg" ]; then install "UnitySetup-iOS-Support-for-Editor.pkg"; else install "MacEditorTargetInstaller/UnitySetup-iOS-Support-for-Editor-$VERSION.pkg"; fi From 95091790645d53b8e8f0bc4c216ebae3e69313d3 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Mon, 12 Feb 2018 00:42:36 -0800 Subject: [PATCH 076/109] Update install.sh --- scripts/install.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index 756816877..a91acfcee 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -18,7 +18,6 @@ download() { install() { package=$1 - download "$package" echo "Installing "`basename "$package"` sudo installer -dumplog -package `basename "$package"` -target / @@ -27,8 +26,8 @@ install() { # See $BASE_URL/$HASH/unity-$VERSION-$PLATFORM.ini for complete list # of available packages, where PLATFORM is `osx` or `win` -if [ ! -f "Unity-Mac.pkg" ]; then install "Unity-Mac.pkg"; else install "MacEditorInstaller/Unity-$VERSION.pkg"; fi +if [ -f "Unity-Mac.pkg" ]; then install "Unity-Mac.pkg"; else download "MacEditorInstaller/Unity-$VERSION.pkg" && install "MacEditorInstaller/Unity-$VERSION.pkg"; fi wait -if [ ! -f "UnitySetup-Windows-Support-for-Editor.pkg" ]; then install "UnitySetup-Windows-Support-for-Editor.pkg"; else install "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg"; fi +if [ -f "UnitySetup-Windows-Support-for-Editor.pkg" ]; then install "UnitySetup-Windows-Support-for-Editor.pkg"; else download "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg" && install "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg"; fi wait -if [ ! -f "UnitySetup-iOS-Support-for-Editor.pkg" ]; then install "UnitySetup-iOS-Support-for-Editor.pkg"; else install "MacEditorTargetInstaller/UnitySetup-iOS-Support-for-Editor-$VERSION.pkg"; fi +if [ -f "UnitySetup-iOS-Support-for-Editor.pkg" ]; then install "UnitySetup-iOS-Support-for-Editor.pkg"; else download "MacEditorTargetInstaller/UnitySetup-iOS-Support-for-Editor-$VERSION.pkg" && install "MacEditorTargetInstaller/UnitySetup-iOS-Support-for-Editor-$VERSION.pkg"; fi From 42f376d37aae4f074de23dfaeac33c08225adcf4 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Mon, 12 Feb 2018 00:48:49 -0800 Subject: [PATCH 077/109] Update install.sh --- scripts/install.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index a91acfcee..ad66eb0de 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -10,8 +10,8 @@ VERSION=$2 download() { file=$1 - url="$BASE_URL/$HASH/$package" - localFile=`basename "$package"` + url="$BASE_URL/$HASH/$file" + localFile=`basename "$file"` if [ ! -f "$localFile" ]; then echo "Downloading $url" && curl -o "$localFile" "$url"; fi } @@ -26,8 +26,8 @@ install() { # See $BASE_URL/$HASH/unity-$VERSION-$PLATFORM.ini for complete list # of available packages, where PLATFORM is `osx` or `win` -if [ -f "Unity-Mac.pkg" ]; then install "Unity-Mac.pkg"; else download "MacEditorInstaller/Unity-$VERSION.pkg" && install "MacEditorInstaller/Unity-$VERSION.pkg"; fi +if [ ! -f "Unity-Mac.pkg" ]; then install "Unity-Mac.pkg"; else download "MacEditorInstaller/Unity-$VERSION.pkg" && install "MacEditorInstaller/Unity-$VERSION.pkg"; fi wait -if [ -f "UnitySetup-Windows-Support-for-Editor.pkg" ]; then install "UnitySetup-Windows-Support-for-Editor.pkg"; else download "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg" && install "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg"; fi +if [ ! -f "UnitySetup-Windows-Support-for-Editor.pkg" ]; then install "UnitySetup-Windows-Support-for-Editor.pkg"; else download "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg" && install "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg"; fi wait -if [ -f "UnitySetup-iOS-Support-for-Editor.pkg" ]; then install "UnitySetup-iOS-Support-for-Editor.pkg"; else download "MacEditorTargetInstaller/UnitySetup-iOS-Support-for-Editor-$VERSION.pkg" && install "MacEditorTargetInstaller/UnitySetup-iOS-Support-for-Editor-$VERSION.pkg"; fi +if [ ! -f "UnitySetup-iOS-Support-for-Editor.pkg" ]; then install "UnitySetup-iOS-Support-for-Editor.pkg"; else download "MacEditorTargetInstaller/UnitySetup-iOS-Support-for-Editor-$VERSION.pkg" && install "MacEditorTargetInstaller/UnitySetup-iOS-Support-for-Editor-$VERSION.pkg"; fi From af3e687c287505900c583cf7b9931ca3a0454a33 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Mon, 12 Feb 2018 00:53:32 -0800 Subject: [PATCH 078/109] Update install.sh --- scripts/install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index ad66eb0de..f52abb52a 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -26,8 +26,8 @@ install() { # See $BASE_URL/$HASH/unity-$VERSION-$PLATFORM.ini for complete list # of available packages, where PLATFORM is `osx` or `win` -if [ ! -f "Unity-Mac.pkg" ]; then install "Unity-Mac.pkg"; else download "MacEditorInstaller/Unity-$VERSION.pkg" && install "MacEditorInstaller/Unity-$VERSION.pkg"; fi +if [ ! -f "Unity-Mac.pkg" ]; then install "../project/Unity-Mac.pkg"; else download "MacEditorInstaller/Unity-$VERSION.pkg" && install "MacEditorInstaller/Unity-$VERSION.pkg"; fi wait -if [ ! -f "UnitySetup-Windows-Support-for-Editor.pkg" ]; then install "UnitySetup-Windows-Support-for-Editor.pkg"; else download "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg" && install "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg"; fi +if [ ! -f "UnitySetup-Windows-Support-for-Editor.pkg" ]; then install "../project/UnitySetup-Windows-Support-for-Editor.pkg"; else download "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg" && install "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg"; fi wait -if [ ! -f "UnitySetup-iOS-Support-for-Editor.pkg" ]; then install "UnitySetup-iOS-Support-for-Editor.pkg"; else download "MacEditorTargetInstaller/UnitySetup-iOS-Support-for-Editor-$VERSION.pkg" && install "MacEditorTargetInstaller/UnitySetup-iOS-Support-for-Editor-$VERSION.pkg"; fi +if [ ! -f "UnitySetup-iOS-Support-for-Editor.pkg" ]; then install "../project/UnitySetup-iOS-Support-for-Editor.pkg"; else download "MacEditorTargetInstaller/UnitySetup-iOS-Support-for-Editor-$VERSION.pkg" && install "MacEditorTargetInstaller/UnitySetup-iOS-Support-for-Editor-$VERSION.pkg"; fi From 4821f023efc4217aea229e1646e62899f34ed3f6 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Mon, 12 Feb 2018 00:59:41 -0800 Subject: [PATCH 079/109] Update install.sh --- scripts/install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index f52abb52a..70633a189 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -26,8 +26,8 @@ install() { # See $BASE_URL/$HASH/unity-$VERSION-$PLATFORM.ini for complete list # of available packages, where PLATFORM is `osx` or `win` -if [ ! -f "Unity-Mac.pkg" ]; then install "../project/Unity-Mac.pkg"; else download "MacEditorInstaller/Unity-$VERSION.pkg" && install "MacEditorInstaller/Unity-$VERSION.pkg"; fi +if [ ! -f "Unity-Mac.pkg" ]; then cd .. && cd project && install "Unity-Mac.pkg"; else download "MacEditorInstaller/Unity-$VERSION.pkg" && install "MacEditorInstaller/Unity-$VERSION.pkg"; fi wait -if [ ! -f "UnitySetup-Windows-Support-for-Editor.pkg" ]; then install "../project/UnitySetup-Windows-Support-for-Editor.pkg"; else download "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg" && install "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg"; fi +if [ ! -f "UnitySetup-Windows-Support-for-Editor.pkg" ]; then cd .. && cd project && install "UnitySetup-Windows-Support-for-Editor.pkg"; else download "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg" && install "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg"; fi wait -if [ ! -f "UnitySetup-iOS-Support-for-Editor.pkg" ]; then install "../project/UnitySetup-iOS-Support-for-Editor.pkg"; else download "MacEditorTargetInstaller/UnitySetup-iOS-Support-for-Editor-$VERSION.pkg" && install "MacEditorTargetInstaller/UnitySetup-iOS-Support-for-Editor-$VERSION.pkg"; fi +if [ ! -f "UnitySetup-iOS-Support-for-Editor.pkg" ]; then cd .. && cd project && install "UnitySetup-iOS-Support-for-Editor.pkg"; else download "MacEditorTargetInstaller/UnitySetup-iOS-Support-for-Editor-$VERSION.pkg" && install "MacEditorTargetInstaller/UnitySetup-iOS-Support-for-Editor-$VERSION.pkg"; fi From 40ecee50432e264ce15f354561e57c375405e3a6 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Mon, 12 Feb 2018 01:09:59 -0800 Subject: [PATCH 080/109] Update install.sh --- scripts/install.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index 70633a189..e45792e9d 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -25,9 +25,9 @@ install() { # See $BASE_URL/$HASH/unity-$VERSION-$PLATFORM.ini for complete list # of available packages, where PLATFORM is `osx` or `win` - -if [ ! -f "Unity-Mac.pkg" ]; then cd .. && cd project && install "Unity-Mac.pkg"; else download "MacEditorInstaller/Unity-$VERSION.pkg" && install "MacEditorInstaller/Unity-$VERSION.pkg"; fi +cd .. && cd project +if [ ! -f "Unity-Mac.pkg" ]; then install "Unity-Mac.pkg"; else download "MacEditorInstaller/Unity-$VERSION.pkg" && install "MacEditorInstaller/Unity-$VERSION.pkg"; fi wait -if [ ! -f "UnitySetup-Windows-Support-for-Editor.pkg" ]; then cd .. && cd project && install "UnitySetup-Windows-Support-for-Editor.pkg"; else download "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg" && install "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg"; fi +if [ ! -f "UnitySetup-Windows-Support-for-Editor.pkg" ]; then install "UnitySetup-Windows-Support-for-Editor.pkg"; else download "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg" && install "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg"; fi wait -if [ ! -f "UnitySetup-iOS-Support-for-Editor.pkg" ]; then cd .. && cd project && install "UnitySetup-iOS-Support-for-Editor.pkg"; else download "MacEditorTargetInstaller/UnitySetup-iOS-Support-for-Editor-$VERSION.pkg" && install "MacEditorTargetInstaller/UnitySetup-iOS-Support-for-Editor-$VERSION.pkg"; fi +if [ ! -f "UnitySetup-iOS-Support-for-Editor.pkg" ]; then install "UnitySetup-iOS-Support-for-Editor.pkg"; else download "MacEditorTargetInstaller/UnitySetup-iOS-Support-for-Editor-$VERSION.pkg" && install "MacEditorTargetInstaller/UnitySetup-iOS-Support-for-Editor-$VERSION.pkg"; fi From 52cdc06195dd5ca88b1d1ed792fb68082b3c2bf4 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Mon, 12 Feb 2018 01:13:44 -0800 Subject: [PATCH 081/109] Update install.sh --- scripts/install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index e45792e9d..379aa673a 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -26,8 +26,8 @@ install() { # See $BASE_URL/$HASH/unity-$VERSION-$PLATFORM.ini for complete list # of available packages, where PLATFORM is `osx` or `win` cd .. && cd project -if [ ! -f "Unity-Mac.pkg" ]; then install "Unity-Mac.pkg"; else download "MacEditorInstaller/Unity-$VERSION.pkg" && install "MacEditorInstaller/Unity-$VERSION.pkg"; fi +if [ -f "Unity-Mac.pkg" ]; then install "Unity-Mac.pkg"; else download "MacEditorInstaller/Unity-$VERSION.pkg" && install "MacEditorInstaller/Unity-$VERSION.pkg"; fi wait -if [ ! -f "UnitySetup-Windows-Support-for-Editor.pkg" ]; then install "UnitySetup-Windows-Support-for-Editor.pkg"; else download "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg" && install "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg"; fi +if [ -f "UnitySetup-Windows-Support-for-Editor.pkg" ]; then install "UnitySetup-Windows-Support-for-Editor.pkg"; else download "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg" && install "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg"; fi wait -if [ ! -f "UnitySetup-iOS-Support-for-Editor.pkg" ]; then install "UnitySetup-iOS-Support-for-Editor.pkg"; else download "MacEditorTargetInstaller/UnitySetup-iOS-Support-for-Editor-$VERSION.pkg" && install "MacEditorTargetInstaller/UnitySetup-iOS-Support-for-Editor-$VERSION.pkg"; fi +if [ -f "UnitySetup-iOS-Support-for-Editor.pkg" ]; then install "UnitySetup-iOS-Support-for-Editor.pkg"; else download "MacEditorTargetInstaller/UnitySetup-iOS-Support-for-Editor-$VERSION.pkg" && install "MacEditorTargetInstaller/UnitySetup-iOS-Support-for-Editor-$VERSION.pkg"; fi From dace13dc5153f5916e6ca4b3dadd4986f80420cd Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Mon, 12 Feb 2018 01:21:59 -0800 Subject: [PATCH 082/109] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9a598c140..b7557f08a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,7 +22,7 @@ jobs: command: ./scripts/install.sh ${HASH} ${UNITYVERSION} - run: name: Renaming Files - command: mv Unity-${UNITYVERSION}.pkg Unity-Mac.pkg && mv UnitySetup-Windows-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-Windows-Support-for-Editor.pkg && mv UnitySetup-iOS-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-iOS-Support-for-Editor.pkg + command: if [ ! -f "Unity-Mac.pkg" ]; then mv Unity-${UNITYVERSION}.pkg Unity-Mac.pkg && if [ ! -f "UnitySetup-Windows-Support-for-Editor.pkg" ]; then mv UnitySetup-Windows-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-Windows-Support-for-Editor.pkg && if [ ! -f "UnitySetup-iOS-Support-for-Editor.pkg" ]; then mv UnitySetup-iOS-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-iOS-Support-for-Editor.pkg - save_cache: key: unity-installer-cache-988 From d7398cbbe0bb3fa0b91e3aa9719112ded20284d9 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Mon, 12 Feb 2018 15:15:15 -0800 Subject: [PATCH 083/109] Update config.yml --- .circleci/config.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b7557f08a..a938491c2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,8 +22,9 @@ jobs: command: ./scripts/install.sh ${HASH} ${UNITYVERSION} - run: name: Renaming Files - command: if [ ! -f "Unity-Mac.pkg" ]; then mv Unity-${UNITYVERSION}.pkg Unity-Mac.pkg && if [ ! -f "UnitySetup-Windows-Support-for-Editor.pkg" ]; then mv UnitySetup-Windows-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-Windows-Support-for-Editor.pkg && if [ ! -f "UnitySetup-iOS-Support-for-Editor.pkg" ]; then mv UnitySetup-iOS-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-iOS-Support-for-Editor.pkg - + command: if [ ! -f "Unity-Mac.pkg" ]; then mv Unity-${UNITYVERSION}.pkg Unity-Mac.pkg; fi \ + && if [ ! -f "UnitySetup-Windows-Support-for-Editor.pkg" ]; then mv UnitySetup-Windows-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-Windows-Support-for-Editor.pkg; fi \ + && if [ ! -f "UnitySetup-iOS-Support-for-Editor.pkg" ]; then mv UnitySetup-iOS-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-iOS-Support-for-Editor.pkg; fi - save_cache: key: unity-installer-cache-988 paths: From 3ddb426f8db3bcae0b6999faca44dae86f5b6072 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Mon, 12 Feb 2018 15:16:29 -0800 Subject: [PATCH 084/109] Update config.yml --- .circleci/config.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a938491c2..43480383d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,9 +22,7 @@ jobs: command: ./scripts/install.sh ${HASH} ${UNITYVERSION} - run: name: Renaming Files - command: if [ ! -f "Unity-Mac.pkg" ]; then mv Unity-${UNITYVERSION}.pkg Unity-Mac.pkg; fi \ - && if [ ! -f "UnitySetup-Windows-Support-for-Editor.pkg" ]; then mv UnitySetup-Windows-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-Windows-Support-for-Editor.pkg; fi \ - && if [ ! -f "UnitySetup-iOS-Support-for-Editor.pkg" ]; then mv UnitySetup-iOS-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-iOS-Support-for-Editor.pkg; fi + command: if [ ! -f "Unity-Mac.pkg" ]; then mv Unity-${UNITYVERSION}.pkg Unity-Mac.pkg; fi && if [ ! -f "UnitySetup-Windows-Support-for-Editor.pkg" ]; then mv UnitySetup-Windows-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-Windows-Support-for-Editor.pkg; fi && if [ ! -f "UnitySetup-iOS-Support-for-Editor.pkg" ]; then mv UnitySetup-iOS-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-iOS-Support-for-Editor.pkg; fi - save_cache: key: unity-installer-cache-988 paths: From 5c8ba9ca7188784ceb70ce17641368f263fac8dd Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Mon, 12 Feb 2018 15:23:34 -0800 Subject: [PATCH 085/109] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 43480383d..a50210843 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,7 +22,7 @@ jobs: command: ./scripts/install.sh ${HASH} ${UNITYVERSION} - run: name: Renaming Files - command: if [ ! -f "Unity-Mac.pkg" ]; then mv Unity-${UNITYVERSION}.pkg Unity-Mac.pkg; fi && if [ ! -f "UnitySetup-Windows-Support-for-Editor.pkg" ]; then mv UnitySetup-Windows-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-Windows-Support-for-Editor.pkg; fi && if [ ! -f "UnitySetup-iOS-Support-for-Editor.pkg" ]; then mv UnitySetup-iOS-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-iOS-Support-for-Editor.pkg; fi + command: if [ ! -f "../project/Unity-Mac.pkg" ]; then mv Unity-${UNITYVERSION}.pkg Unity-Mac.pkg; fi && if [ ! -f "../project/UnitySetup-Windows-Support-for-Editor.pkg" ]; then mv UnitySetup-Windows-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-Windows-Support-for-Editor.pkg; fi && if [ ! -f "../project/UnitySetup-iOS-Support-for-Editor.pkg" ]; then mv UnitySetup-iOS-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-iOS-Support-for-Editor.pkg; fi - save_cache: key: unity-installer-cache-988 paths: From 300d8342a7fa11b8680145e162d3a68a8feb17c5 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Mon, 12 Feb 2018 15:35:38 -0800 Subject: [PATCH 086/109] Update config.yml --- .circleci/config.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a50210843..386943e09 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,10 +9,11 @@ jobs: environment: - UNITYVERSION: 2017.1.0f3 - HASH: 472613c02cf7 + - TEST: 977 steps: - restore_cache: - keys: unity-installer-cache-988 + keys: unity-installer-cache-$TEST - checkout - run: name: GIT Checkout @@ -24,7 +25,7 @@ jobs: name: Renaming Files command: if [ ! -f "../project/Unity-Mac.pkg" ]; then mv Unity-${UNITYVERSION}.pkg Unity-Mac.pkg; fi && if [ ! -f "../project/UnitySetup-Windows-Support-for-Editor.pkg" ]; then mv UnitySetup-Windows-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-Windows-Support-for-Editor.pkg; fi && if [ ! -f "../project/UnitySetup-iOS-Support-for-Editor.pkg" ]; then mv UnitySetup-iOS-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-iOS-Support-for-Editor.pkg; fi - save_cache: - key: unity-installer-cache-988 + key: unity-installer-cache-$TEST paths: - Unity-Mac.pkg - UnitySetup-Windows-Support-for-Editor.pkg From 8cab64d2675fe43a0941a3cf91c07fcdce0de42c Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Mon, 12 Feb 2018 15:39:40 -0800 Subject: [PATCH 087/109] Update install.sh --- scripts/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install.sh b/scripts/install.sh index 379aa673a..65bdf5af5 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -25,7 +25,7 @@ install() { # See $BASE_URL/$HASH/unity-$VERSION-$PLATFORM.ini for complete list # of available packages, where PLATFORM is `osx` or `win` -cd .. && cd project +if [ -d "../project" ]; then cd .. && cd project; fi if [ -f "Unity-Mac.pkg" ]; then install "Unity-Mac.pkg"; else download "MacEditorInstaller/Unity-$VERSION.pkg" && install "MacEditorInstaller/Unity-$VERSION.pkg"; fi wait if [ -f "UnitySetup-Windows-Support-for-Editor.pkg" ]; then install "UnitySetup-Windows-Support-for-Editor.pkg"; else download "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg" && install "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg"; fi From c0dd03020b2ece09ff4b2c84baced7df677f212d Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Mon, 12 Feb 2018 15:53:53 -0800 Subject: [PATCH 088/109] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 386943e09..6027e1b62 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,7 @@ jobs: macos: xcode: "9.2.0" - working_directory: ~/tmp + working_directory: ~/ttt environment: - UNITYVERSION: 2017.1.0f3 - HASH: 472613c02cf7 From de006681900b98499ca79f579aac12233f8289f3 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Mon, 12 Feb 2018 15:54:56 -0800 Subject: [PATCH 089/109] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6027e1b62..97e6eb95d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,7 +9,7 @@ jobs: environment: - UNITYVERSION: 2017.1.0f3 - HASH: 472613c02cf7 - - TEST: 977 + - TEST: 982 steps: - restore_cache: From 2b97a01392d38e4a56131e095222f9a851390ece Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Mon, 12 Feb 2018 15:56:53 -0800 Subject: [PATCH 090/109] Update config.yml --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 97e6eb95d..c102a8d35 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,7 +13,7 @@ jobs: steps: - restore_cache: - keys: unity-installer-cache-$TEST + keys: unity-installer-cache-${TEST} - checkout - run: name: GIT Checkout @@ -25,7 +25,7 @@ jobs: name: Renaming Files command: if [ ! -f "../project/Unity-Mac.pkg" ]; then mv Unity-${UNITYVERSION}.pkg Unity-Mac.pkg; fi && if [ ! -f "../project/UnitySetup-Windows-Support-for-Editor.pkg" ]; then mv UnitySetup-Windows-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-Windows-Support-for-Editor.pkg; fi && if [ ! -f "../project/UnitySetup-iOS-Support-for-Editor.pkg" ]; then mv UnitySetup-iOS-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-iOS-Support-for-Editor.pkg; fi - save_cache: - key: unity-installer-cache-$TEST + key: unity-installer-cache-${TEST} paths: - Unity-Mac.pkg - UnitySetup-Windows-Support-for-Editor.pkg From 367181e21e914141b6586d4e1e9b2bca3bbb23f2 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Mon, 12 Feb 2018 16:14:19 -0800 Subject: [PATCH 091/109] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c102a8d35..ec0914a93 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,7 +9,7 @@ jobs: environment: - UNITYVERSION: 2017.1.0f3 - HASH: 472613c02cf7 - - TEST: 982 + - TEST: 983 steps: - restore_cache: From 63d5a81148f7dd7c416bd02b801e9e66efe3bc79 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Mon, 12 Feb 2018 16:16:03 -0800 Subject: [PATCH 092/109] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ec0914a93..67e6f90a2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,7 +9,7 @@ jobs: environment: - UNITYVERSION: 2017.1.0f3 - HASH: 472613c02cf7 - - TEST: 983 + - TEST: 955 steps: - restore_cache: From c1d64db37ae5867d9d7815b8fed498c0f0cd8411 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Mon, 12 Feb 2018 16:21:41 -0800 Subject: [PATCH 093/109] Update config.yml --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 67e6f90a2..1b67f2bc7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,7 +13,7 @@ jobs: steps: - restore_cache: - keys: unity-installer-cache-${TEST} + keys: unity-installer-cache-{{ .Environment.TEST }} - checkout - run: name: GIT Checkout @@ -25,7 +25,7 @@ jobs: name: Renaming Files command: if [ ! -f "../project/Unity-Mac.pkg" ]; then mv Unity-${UNITYVERSION}.pkg Unity-Mac.pkg; fi && if [ ! -f "../project/UnitySetup-Windows-Support-for-Editor.pkg" ]; then mv UnitySetup-Windows-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-Windows-Support-for-Editor.pkg; fi && if [ ! -f "../project/UnitySetup-iOS-Support-for-Editor.pkg" ]; then mv UnitySetup-iOS-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-iOS-Support-for-Editor.pkg; fi - save_cache: - key: unity-installer-cache-${TEST} + key: unity-installer-cache-{{ .Environment.TEST }} paths: - Unity-Mac.pkg - UnitySetup-Windows-Support-for-Editor.pkg From 2176d70304a88729ed73a63b87c7ad582bbb4976 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Mon, 12 Feb 2018 17:14:26 -0800 Subject: [PATCH 094/109] Update config.yml --- .circleci/config.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1b67f2bc7..95b81b19d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,15 +5,14 @@ jobs: macos: xcode: "9.2.0" - working_directory: ~/ttt + working_directory: ~/tmp1000 environment: - UNITYVERSION: 2017.1.0f3 - HASH: 472613c02cf7 - - TEST: 955 - + steps: - restore_cache: - keys: unity-installer-cache-{{ .Environment.TEST }} + keys: unity-installer-cache-1000 - checkout - run: name: GIT Checkout @@ -25,7 +24,7 @@ jobs: name: Renaming Files command: if [ ! -f "../project/Unity-Mac.pkg" ]; then mv Unity-${UNITYVERSION}.pkg Unity-Mac.pkg; fi && if [ ! -f "../project/UnitySetup-Windows-Support-for-Editor.pkg" ]; then mv UnitySetup-Windows-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-Windows-Support-for-Editor.pkg; fi && if [ ! -f "../project/UnitySetup-iOS-Support-for-Editor.pkg" ]; then mv UnitySetup-iOS-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-iOS-Support-for-Editor.pkg; fi - save_cache: - key: unity-installer-cache-{{ .Environment.TEST }} + key: unity-installer-cache-1000 paths: - Unity-Mac.pkg - UnitySetup-Windows-Support-for-Editor.pkg From 6d2ab6a22853bfad69fd432c5d1d2ff4a63700e2 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Mon, 12 Feb 2018 17:32:46 -0800 Subject: [PATCH 095/109] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 95b81b19d..865d038f7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,7 @@ jobs: macos: xcode: "9.2.0" - working_directory: ~/tmp1000 + working_directory: ~/tmp environment: - UNITYVERSION: 2017.1.0f3 - HASH: 472613c02cf7 From e32862406c016ef3f9dd2e49d1ebcf35de9a34fb Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Tue, 13 Feb 2018 14:56:50 -0800 Subject: [PATCH 096/109] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 865d038f7..e75eb7956 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,7 @@ jobs: macos: xcode: "9.2.0" - working_directory: ~/tmp + working_directory: ~/temporarie environment: - UNITYVERSION: 2017.1.0f3 - HASH: 472613c02cf7 From 1d94ce5e96a93f076f22098ac04d37ae982684b9 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Tue, 13 Feb 2018 14:58:02 -0800 Subject: [PATCH 097/109] Update config.yml --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e75eb7956..0bfd2297a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,7 @@ jobs: steps: - restore_cache: - keys: unity-installer-cache-1000 + keys: unity-installer-cache-500 - checkout - run: name: GIT Checkout @@ -24,7 +24,7 @@ jobs: name: Renaming Files command: if [ ! -f "../project/Unity-Mac.pkg" ]; then mv Unity-${UNITYVERSION}.pkg Unity-Mac.pkg; fi && if [ ! -f "../project/UnitySetup-Windows-Support-for-Editor.pkg" ]; then mv UnitySetup-Windows-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-Windows-Support-for-Editor.pkg; fi && if [ ! -f "../project/UnitySetup-iOS-Support-for-Editor.pkg" ]; then mv UnitySetup-iOS-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-iOS-Support-for-Editor.pkg; fi - save_cache: - key: unity-installer-cache-1000 + key: unity-installer-cache-500 paths: - Unity-Mac.pkg - UnitySetup-Windows-Support-for-Editor.pkg From 5a3b91f46735d41acd84166278be8bd6f26b350e Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Tue, 13 Feb 2018 15:07:55 -0800 Subject: [PATCH 098/109] Update install.sh --- scripts/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install.sh b/scripts/install.sh index 65bdf5af5..8356fcd4d 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -25,7 +25,7 @@ install() { # See $BASE_URL/$HASH/unity-$VERSION-$PLATFORM.ini for complete list # of available packages, where PLATFORM is `osx` or `win` -if [ -d "../project" ]; then cd .. && cd project; fi +if [ -d "../$CIRCLE_WORKING_DIRECTORY" ]; then cd .. && cd $CIRCLE_WORKING_DIRECTORY; fi if [ -f "Unity-Mac.pkg" ]; then install "Unity-Mac.pkg"; else download "MacEditorInstaller/Unity-$VERSION.pkg" && install "MacEditorInstaller/Unity-$VERSION.pkg"; fi wait if [ -f "UnitySetup-Windows-Support-for-Editor.pkg" ]; then install "UnitySetup-Windows-Support-for-Editor.pkg"; else download "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg" && install "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg"; fi From 25fe3cba08f81c312c87de6201a42ed4e9932bca Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Tue, 13 Feb 2018 15:09:11 -0800 Subject: [PATCH 099/109] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0bfd2297a..2e0e359c4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,7 +22,7 @@ jobs: command: ./scripts/install.sh ${HASH} ${UNITYVERSION} - run: name: Renaming Files - command: if [ ! -f "../project/Unity-Mac.pkg" ]; then mv Unity-${UNITYVERSION}.pkg Unity-Mac.pkg; fi && if [ ! -f "../project/UnitySetup-Windows-Support-for-Editor.pkg" ]; then mv UnitySetup-Windows-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-Windows-Support-for-Editor.pkg; fi && if [ ! -f "../project/UnitySetup-iOS-Support-for-Editor.pkg" ]; then mv UnitySetup-iOS-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-iOS-Support-for-Editor.pkg; fi + command: if [ ! -f "../$CIRCLE_WORKING_DIRECTORY/Unity-Mac.pkg" ]; then mv Unity-${UNITYVERSION}.pkg Unity-Mac.pkg; fi && if [ ! -f "../$CIRCLE_WORKING_DIRECTORY/UnitySetup-Windows-Support-for-Editor.pkg" ]; then mv UnitySetup-Windows-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-Windows-Support-for-Editor.pkg; fi && if [ ! -f "../$CIRCLE_WORKING_DIRECTORY/UnitySetup-iOS-Support-for-Editor.pkg" ]; then mv UnitySetup-iOS-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-iOS-Support-for-Editor.pkg; fi - save_cache: key: unity-installer-cache-500 paths: From 90afad7cbec42c6dc0fab5f576f986d019e13b0c Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Tue, 13 Feb 2018 15:13:21 -0800 Subject: [PATCH 100/109] Update config.yml --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2e0e359c4..b1b5d7f7e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,18 +5,18 @@ jobs: macos: xcode: "9.2.0" - working_directory: ~/temporarie + working_directory: ~/temporary environment: - UNITYVERSION: 2017.1.0f3 - HASH: 472613c02cf7 steps: - - restore_cache: - keys: unity-installer-cache-500 - checkout - run: name: GIT Checkout command: ./update-mapbox-unity-sdk-core.sh + - restore_cache: + keys: unity-installer-cache-500 - run: name: Installing Unity command: ./scripts/install.sh ${HASH} ${UNITYVERSION} From 225be18ced1442a1b3a2cb78c30e8ad9d3858f5f Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Tue, 13 Feb 2018 15:14:11 -0800 Subject: [PATCH 101/109] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b1b5d7f7e..22b57cabe 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,7 @@ jobs: macos: xcode: "9.2.0" - working_directory: ~/temporary + working_directory: ~/temporarie environment: - UNITYVERSION: 2017.1.0f3 - HASH: 472613c02cf7 From 209bbd8ac368b94333f484d1dd581f273143ca3e Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Tue, 13 Feb 2018 15:21:50 -0800 Subject: [PATCH 102/109] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 22b57cabe..1e9947535 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,7 +22,7 @@ jobs: command: ./scripts/install.sh ${HASH} ${UNITYVERSION} - run: name: Renaming Files - command: if [ ! -f "../$CIRCLE_WORKING_DIRECTORY/Unity-Mac.pkg" ]; then mv Unity-${UNITYVERSION}.pkg Unity-Mac.pkg; fi && if [ ! -f "../$CIRCLE_WORKING_DIRECTORY/UnitySetup-Windows-Support-for-Editor.pkg" ]; then mv UnitySetup-Windows-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-Windows-Support-for-Editor.pkg; fi && if [ ! -f "../$CIRCLE_WORKING_DIRECTORY/UnitySetup-iOS-Support-for-Editor.pkg" ]; then mv UnitySetup-iOS-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-iOS-Support-for-Editor.pkg; fi + command: if [ ! -f "../${CIRCLE_WORKING_DIRECTORY}/Unity-Mac.pkg" ]; then mv Unity-${UNITYVERSION}.pkg Unity-Mac.pkg; fi && if [ ! -f "../${CIRCLE_WORKING_DIRECTORY}/UnitySetup-Windows-Support-for-Editor.pkg" ]; then mv UnitySetup-Windows-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-Windows-Support-for-Editor.pkg; fi && if [ ! -f "../$CIRCLE_WORKING_DIRECTORY/UnitySetup-iOS-Support-for-Editor.pkg" ]; then mv UnitySetup-iOS-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-iOS-Support-for-Editor.pkg; fi - save_cache: key: unity-installer-cache-500 paths: From c7a5d3546270ad5f2fa58be66b7b85b3ab39b61e Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Tue, 13 Feb 2018 15:34:58 -0800 Subject: [PATCH 103/109] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1e9947535..596bcfe28 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,7 +22,7 @@ jobs: command: ./scripts/install.sh ${HASH} ${UNITYVERSION} - run: name: Renaming Files - command: if [ ! -f "../${CIRCLE_WORKING_DIRECTORY}/Unity-Mac.pkg" ]; then mv Unity-${UNITYVERSION}.pkg Unity-Mac.pkg; fi && if [ ! -f "../${CIRCLE_WORKING_DIRECTORY}/UnitySetup-Windows-Support-for-Editor.pkg" ]; then mv UnitySetup-Windows-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-Windows-Support-for-Editor.pkg; fi && if [ ! -f "../$CIRCLE_WORKING_DIRECTORY/UnitySetup-iOS-Support-for-Editor.pkg" ]; then mv UnitySetup-iOS-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-iOS-Support-for-Editor.pkg; fi + command: if [ ! -f "${CIRCLE_WORKING_DIRECTORY}/Unity-Mac.pkg" ]; then mv Unity-${UNITYVERSION}.pkg Unity-Mac.pkg; fi && if [ ! -f "${CIRCLE_WORKING_DIRECTORY}/UnitySetup-Windows-Support-for-Editor.pkg" ]; then mv UnitySetup-Windows-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-Windows-Support-for-Editor.pkg; fi && if [ ! -f "${CIRCLE_WORKING_DIRECTORY}/UnitySetup-iOS-Support-for-Editor.pkg" ]; then mv UnitySetup-iOS-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-iOS-Support-for-Editor.pkg; fi - save_cache: key: unity-installer-cache-500 paths: From fc2d1f58ed8f7a99ea3542fdc5a91d3b14ec797b Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Tue, 13 Feb 2018 15:42:46 -0800 Subject: [PATCH 104/109] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 596bcfe28..dc355f136 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,7 +22,7 @@ jobs: command: ./scripts/install.sh ${HASH} ${UNITYVERSION} - run: name: Renaming Files - command: if [ ! -f "${CIRCLE_WORKING_DIRECTORY}/Unity-Mac.pkg" ]; then mv Unity-${UNITYVERSION}.pkg Unity-Mac.pkg; fi && if [ ! -f "${CIRCLE_WORKING_DIRECTORY}/UnitySetup-Windows-Support-for-Editor.pkg" ]; then mv UnitySetup-Windows-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-Windows-Support-for-Editor.pkg; fi && if [ ! -f "${CIRCLE_WORKING_DIRECTORY}/UnitySetup-iOS-Support-for-Editor.pkg" ]; then mv UnitySetup-iOS-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-iOS-Support-for-Editor.pkg; fi + command: ls && if [ ! -f "${CIRCLE_WORKING_DIRECTORY}/Unity-Mac.pkg" ]; then mv Unity-${UNITYVERSION}.pkg Unity-Mac.pkg; fi && if [ ! -f "${CIRCLE_WORKING_DIRECTORY}/UnitySetup-Windows-Support-for-Editor.pkg" ]; then mv UnitySetup-Windows-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-Windows-Support-for-Editor.pkg; fi && if [ ! -f "${CIRCLE_WORKING_DIRECTORY}/UnitySetup-iOS-Support-for-Editor.pkg" ]; then mv UnitySetup-iOS-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-iOS-Support-for-Editor.pkg; fi - save_cache: key: unity-installer-cache-500 paths: From 39f83301be929cdbd9b907b98a1f4dcbdfe5f5ba Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Tue, 13 Feb 2018 15:43:02 -0800 Subject: [PATCH 105/109] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index dc355f136..5a61e166c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,7 +14,7 @@ jobs: - checkout - run: name: GIT Checkout - command: ./update-mapbox-unity-sdk-core.sh + command: ls && ./update-mapbox-unity-sdk-core.sh - restore_cache: keys: unity-installer-cache-500 - run: From 75b4d4321d8880150d7cd6b14d79f88ff8cf376e Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Tue, 13 Feb 2018 15:47:14 -0800 Subject: [PATCH 106/109] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5a61e166c..32507bf28 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,7 +14,7 @@ jobs: - checkout - run: name: GIT Checkout - command: ls && ./update-mapbox-unity-sdk-core.sh + command: pwd && ./update-mapbox-unity-sdk-core.sh - restore_cache: keys: unity-installer-cache-500 - run: From 8be73aed870d2e2dfc7fb1b98bf251933144567d Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Tue, 13 Feb 2018 15:50:06 -0800 Subject: [PATCH 107/109] Update config.yml --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 32507bf28..041d9f7bc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,7 +14,7 @@ jobs: - checkout - run: name: GIT Checkout - command: pwd && ./update-mapbox-unity-sdk-core.sh + command: ./update-mapbox-unity-sdk-core.sh - restore_cache: keys: unity-installer-cache-500 - run: @@ -22,7 +22,7 @@ jobs: command: ./scripts/install.sh ${HASH} ${UNITYVERSION} - run: name: Renaming Files - command: ls && if [ ! -f "${CIRCLE_WORKING_DIRECTORY}/Unity-Mac.pkg" ]; then mv Unity-${UNITYVERSION}.pkg Unity-Mac.pkg; fi && if [ ! -f "${CIRCLE_WORKING_DIRECTORY}/UnitySetup-Windows-Support-for-Editor.pkg" ]; then mv UnitySetup-Windows-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-Windows-Support-for-Editor.pkg; fi && if [ ! -f "${CIRCLE_WORKING_DIRECTORY}/UnitySetup-iOS-Support-for-Editor.pkg" ]; then mv UnitySetup-iOS-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-iOS-Support-for-Editor.pkg; fi + command: if [ ! -f "Unity-Mac.pkg" ]; then mv Unity-${UNITYVERSION}.pkg Unity-Mac.pkg; fi && if [ ! -f "UnitySetup-Windows-Support-for-Editor.pkg" ]; then mv UnitySetup-Windows-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-Windows-Support-for-Editor.pkg; fi && if [ ! -f "UnitySetup-iOS-Support-for-Editor.pkg" ]; then mv UnitySetup-iOS-Support-for-Editor-$UNITYVERSION.pkg UnitySetup-iOS-Support-for-Editor.pkg; fi - save_cache: key: unity-installer-cache-500 paths: From 693e4a1ab2b5d45f719910051b550a9f11bc7030 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Thu, 5 Apr 2018 13:12:18 -0700 Subject: [PATCH 108/109] Update config.yml --- .circleci/config.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 041d9f7bc..04d887efe 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,5 +1,9 @@ # .circleci/config.yml version: 2 +general: + branches: + only: + - CI-Test jobs: build-and-test: macos: From 6e3e3ed44691e93395e3f0fa5c69adbdbdf6b706 Mon Sep 17 00:00:00 2001 From: Adarshkumar Pavani Date: Thu, 5 Apr 2018 16:51:39 -0700 Subject: [PATCH 109/109] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 04d887efe..1f0a7e9fb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2 general: branches: only: - - CI-Test + - develop jobs: build-and-test: macos: