Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ci test #1736

Open
wants to merge 109 commits into
base: TilePrefetching
Choose a base branch
from
Open

Ci test #1736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
109 commits
Select commit Hold shift + click to select a range
0c5bef5
configuring travis to download unity and create a build. lets test it
apavani Jan 26, 2018
0a3e2ff
changing file name
apavani Jan 26, 2018
4c73f80
removing appveyor.yml
apavani Jan 26, 2018
a775bc2
test
apavani Jan 26, 2018
8e88b11
Update .travis.yml
apavani Jan 26, 2018
cd7a42c
Update .travis.yml
apavani Jan 26, 2018
58dedbf
Update .travis.yml
apavani Jan 26, 2018
fb2f768
Update install.sh
apavani Jan 26, 2018
3ec599f
Update build.sh
apavani Jan 26, 2018
0702857
Update install.sh
apavani Jan 26, 2018
3f13456
Update install.sh
apavani Jan 26, 2018
28931c5
Update .travis.yml
apavani Jan 26, 2018
c3dce10
Update install.sh
apavani Jan 26, 2018
b3cea07
Update .travis.yml
apavani Jan 26, 2018
b650413
Update .travis.yml
apavani Jan 26, 2018
5460a5f
Update install.sh
apavani Jan 26, 2018
f0ac09b
Update .travis.yml
apavani Jan 26, 2018
59af056
Update .travis.yml
apavani Jan 26, 2018
71c36f2
small changes to build.sh and install.sh, a+x for both
wilhelmberg Jan 26, 2018
3d02350
Update build.sh
apavani Jan 27, 2018
9299d86
Update .travis.yml
apavani Jan 27, 2018
77338fb
Update .travis.yml
apavani Jan 27, 2018
f62195b
adding the right script
apavani Feb 1, 2018
ce6281f
Update .travis.yml
apavani Feb 1, 2018
0091b91
moving to circle ci
apavani Feb 1, 2018
9f7b527
..
apavani Feb 1, 2018
74a9f4a
changes to config.yml
apavani Feb 1, 2018
b73e4dc
..
apavani Feb 1, 2018
08c1fe5
removing the pipe
apavani Feb 1, 2018
4a26008
build script with changes to build.sh
apavani Feb 2, 2018
d604c04
Update build.sh
apavani Feb 6, 2018
1c7ed5b
adding appveyor back
apavani Feb 9, 2018
bf4ee99
adding back travis to build docs only
apavani Feb 9, 2018
0558144
removing junk
apavani Feb 9, 2018
d3a23bf
Update install.sh
apavani Feb 10, 2018
d6e6524
Update config.yml
apavani Feb 10, 2018
8b3a71d
Update install.sh
apavani Feb 10, 2018
349c4af
Update config.yml
apavani Feb 10, 2018
cd4c17a
Update config.yml
apavani Feb 10, 2018
4272244
Update config.yml
apavani Feb 10, 2018
bf12838
Update config.yml
apavani Feb 10, 2018
dc3c17f
Update config.yml
apavani Feb 10, 2018
e935949
Update config.yml
apavani Feb 10, 2018
b1e5e30
Update config.yml
apavani Feb 10, 2018
73120d6
Update config.yml
apavani Feb 10, 2018
45b1338
Update config.yml
apavani Feb 10, 2018
80ad47b
Update config.yml
apavani Feb 10, 2018
a57eb5f
Update config.yml
apavani Feb 10, 2018
efa5d5b
Update config.yml
apavani Feb 10, 2018
043425d
Update config.yml
apavani Feb 10, 2018
3403210
Update config.yml
apavani Feb 10, 2018
6b3600a
Update config.yml
apavani Feb 10, 2018
fd86fce
Update config.yml
apavani Feb 10, 2018
aad2e50
Update config.yml
apavani Feb 10, 2018
d73621b
Update config.yml
apavani Feb 10, 2018
93759df
Update config.yml
apavani Feb 10, 2018
1faf2a5
Update config.yml
apavani Feb 10, 2018
1ac4bda
Update config.yml
apavani Feb 10, 2018
3e30ba4
Update config.yml
apavani Feb 10, 2018
32c7cd3
Update config.yml
apavani Feb 10, 2018
645e740
Update config.yml
apavani Feb 10, 2018
627bfa2
Update config.yml
apavani Feb 10, 2018
ae2b587
Update config.yml
apavani Feb 10, 2018
65d29a2
Update config.yml
apavani Feb 10, 2018
2012d1a
Update config.yml
apavani Feb 10, 2018
c8e49dd
Update config.yml
apavani Feb 10, 2018
0fbab77
Update config.yml
apavani Feb 10, 2018
6159815
tetw
apavani Feb 10, 2018
4957102
Update config.yml
apavani Feb 10, 2018
c7545ec
Update install.sh
apavani Feb 10, 2018
f8e6c99
Update install.sh
apavani Feb 12, 2018
d95a9c2
Update install.sh
apavani Feb 12, 2018
8d98a72
Update install.sh
apavani Feb 12, 2018
e3f2800
Update install.sh
apavani Feb 12, 2018
d03688c
Update install.sh
apavani Feb 12, 2018
9509179
Update install.sh
apavani Feb 12, 2018
42f376d
Update install.sh
apavani Feb 12, 2018
af3e687
Update install.sh
apavani Feb 12, 2018
4821f02
Update install.sh
apavani Feb 12, 2018
40ecee5
Update install.sh
apavani Feb 12, 2018
52cdc06
Update install.sh
apavani Feb 12, 2018
dace13d
Update config.yml
apavani Feb 12, 2018
d7398cb
Update config.yml
apavani Feb 12, 2018
3ddb426
Update config.yml
apavani Feb 12, 2018
5c8ba9c
Update config.yml
apavani Feb 12, 2018
300d834
Update config.yml
apavani Feb 12, 2018
8cab64d
Update install.sh
apavani Feb 12, 2018
c0dd030
Update config.yml
apavani Feb 12, 2018
de00668
Update config.yml
apavani Feb 12, 2018
2b97a01
Update config.yml
apavani Feb 12, 2018
367181e
Update config.yml
apavani Feb 13, 2018
63d5a81
Update config.yml
apavani Feb 13, 2018
c1d64db
Update config.yml
apavani Feb 13, 2018
2176d70
Update config.yml
apavani Feb 13, 2018
6d2ab6a
Update config.yml
apavani Feb 13, 2018
e328624
Update config.yml
apavani Feb 13, 2018
1d94ce5
Update config.yml
apavani Feb 13, 2018
5a3b91f
Update install.sh
apavani Feb 13, 2018
25fe3cb
Update config.yml
apavani Feb 13, 2018
90afad7
Update config.yml
apavani Feb 13, 2018
225be18
Update config.yml
apavani Feb 13, 2018
209bbd8
Update config.yml
apavani Feb 13, 2018
c7a5d35
Update config.yml
apavani Feb 13, 2018
fc2d1f5
Update config.yml
apavani Feb 13, 2018
39f8330
Update config.yml
apavani Feb 13, 2018
75b4d43
Update config.yml
apavani Feb 13, 2018
8be73ae
Update config.yml
apavani Feb 13, 2018
693e4a1
Update config.yml
apavani Apr 5, 2018
6e3e3ed
Update config.yml
apavani Apr 5, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 44 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# .circleci/config.yml
version: 2
general:
branches:
only:
- develop
jobs:
build-and-test:
macos:
xcode: "9.2.0"

working_directory: ~/temporarie
environment:
- UNITYVERSION: 2017.1.0f3
- HASH: 472613c02cf7

steps:
- 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}
- 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
- save_cache:
key: unity-installer-cache-500
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:
version: 2
build-and-test:
jobs:
- build-and-test
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ mono:
- latest

script:
- ./scripts/build-docs.sh
- ./scripts/build-docs.sh
48 changes: 48 additions & 0 deletions scripts/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
#! /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

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

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}" \
-executeMethod CIBuildScript.BuildForIOS \
-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/
zip -r $(pwd)/Build/windows.zip $(pwd)/Build/windows/
33 changes: 33 additions & 0 deletions scripts/install.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#! /bin/sh

set -eu

df -h

BASE_URL=https://download.unity3d.com/download_unity
HASH=$1
VERSION=$2

download() {
file=$1
url="$BASE_URL/$HASH/$file"
localFile=`basename "$file"`

if [ ! -f "$localFile" ]; then echo "Downloading $url" && curl -o "$localFile" "$url"; fi
}

install() {
package=$1

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`
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
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
10 changes: 10 additions & 0 deletions sdkproject/Assets/Mapbox/Examples/VectorDataVisualization.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -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
41 changes: 41 additions & 0 deletions sdkproject/Assets/MapboxDevTools/Editor/CIBuildScript.cs
Original file line number Diff line number Diff line change
@@ -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;
}
}
12 changes: 12 additions & 0 deletions sdkproject/Assets/MapboxDevTools/Editor/CIBuildScript.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions sdkproject/Assets/Materials.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions sdkproject/Assets/StreamingAssets.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions sdkproject/Assets/StreamingAssets/build_info.txt.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions sdkproject/ProjectSettings/DynamicsManager.asset
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@ PhysicsManager:
m_EnableAdaptiveForce: 0
m_EnablePCM: 1
m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
m_AutoSimulation: 1
m_AutoSyncTransforms: 1
7 changes: 5 additions & 2 deletions sdkproject/ProjectSettings/Physics2DSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion sdkproject/ProjectSettings/ProjectVersion.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
m_EditorVersion: 2017.1.0f3
m_EditorVersion: 2017.2.0f3
4 changes: 4 additions & 0 deletions sdkproject/UnityPackageManager/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"dependencies": {
}
}