-
Notifications
You must be signed in to change notification settings - Fork 491
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Updated documentation and actual project to 2018.4.14f1 - Overhauled the Travis build to use a docker image of a matching version of Unity. (Includes running the playmode and editmode tests) - Updated the skybox to individual images, since the .dds appears unsupported in 2018 (it was never officially supported) - Updated lighting and unit tests, bringing them even closer to the provided sample images (though still quite a ways off from being able to image compare against them instead of our own _EXPECTED images). Changes to Main and TestScenePrefab are primarily re-serialization from the Unity upgrade. Practically the changes were adjusting the lighting and fixing the Model List to point at the loader.
- Loading branch information
Showing
128 changed files
with
1,208 additions
and
1,377 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,45 @@ | ||
os: osx | ||
sudo: required | ||
language: csharp | ||
env: | ||
global: | ||
- BUILD_NAME=UnityGLTF | ||
- PROJECT_PATH=UnityGLTF | ||
- UNITY_VERSION=2018.4.14f1 | ||
services: | ||
- docker | ||
before_install: | ||
# Decrypt the Unity license to UNITY_LICENSE_CONTENT | ||
- openssl aes-256-cbc -K $encrypted_98a45b338031_key -iv $encrypted_98a45b338031_iv | ||
-in ./scripts/Unity_v2018.x.ulf.enc -out ./Unity_v2018.x.ulf -d | ||
- export UNITY_LICENSE_CONTENT=`cat Unity_v2018.x.ulf` | ||
- rm Unity_v2018.x.ulf | ||
# Pull down docker image for this job | ||
- docker pull $IMAGE_NAME | ||
install: | ||
# Build GLTFSerialization for the Unity project | ||
- nuget restore ./GLTFSerialization/GLTFSerialization.sln | ||
- sudo python2 ./scripts/install-unity.py --package Unity 2017.4.16f1 | ||
before_script: | ||
- sudo chmod -R a+rwx /Applications/Unity | ||
script: | ||
- msbuild ./GLTFSerialization/GLTFSerialization.sln /t:GLTFSerialization /p:TargetFramework=net35 | ||
- "./scripts/build-unity-project-and-run-tests.sh" | ||
|
||
# Mark all the scripts as executable | ||
- chmod -R +rwx ./scripts/* | ||
jobs: | ||
include: | ||
- name: "EditMode Test" | ||
stage: test | ||
script: "./scripts/docker_test.sh" | ||
env: TEST_PLATFORM=editmode IMAGE_NAME=gableroux/unity3d:$UNITY_VERSION | ||
- name: "PlayMode Test" | ||
stage: test | ||
script: "./scripts/docker_test.sh" | ||
env: TEST_PLATFORM=playmode IMAGE_NAME=gableroux/unity3d:$UNITY_VERSION | ||
- name: "StandaloneLinux64 Build" | ||
stage: build | ||
env: BUILD_TARGET=StandaloneLinux64 IMAGE_NAME=gableroux/unity3d:$UNITY_VERSION | ||
script: "./scripts/docker_build.sh" | ||
- name: "StandaloneOSX Build" | ||
stage: build | ||
env: BUILD_TARGET=StandaloneOSX IMAGE_NAME=gableroux/unity3d:$UNITY_VERSION-mac | ||
script: "./scripts/docker_build.sh" | ||
- name: "StandaloneWindows64 Build" | ||
stage: build | ||
env: BUILD_TARGET=StandaloneWindows64 IMAGE_NAME=gableroux/unity3d:$UNITY_VERSION-windows | ||
script: "./scripts/docker_build.sh" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Oops, something went wrong.