You need help for something ? Go to https://xr4dev.pages.xr4all.eu

Commit d537bf30 authored by william.guest@open.ac.uk's avatar william.guest@open.ac.uk

Merge branch 'Releases/version_1.2' into 'master'

Releases/version 1.2

See merge request !182
parents bb931494 7a591aea
Pipeline #1867 canceled with stage

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
......@@ -85,3 +85,10 @@ Assets/**/obj*
/App
/CodeCoverage
#Brand Manager config file
#/[Aa]ssets/MirageXR/Resources/MirageXRConfig.txt
#/[Aa]ssets/MirageXR/Resources/MirageXRConfig.txt.meta
# Sketchfab
/Assets/MirageXR/Common/Scripts/Sketchfab/sketchfab.credentials.json
......@@ -2,7 +2,9 @@ default:
image: gableroux/unity3d:2019.4.5f1
stages:
- build_and_test
- activation
- test
- build
- deploy
variables:
......@@ -21,22 +23,43 @@ variables:
paths:
- Library/
# run this job when you need to request a license
# uncomment and run this job when you need to request a license
# you may need to follow activation steps from documentation
get-activation-file:
when: manual
stage: build_and_test
#get-linux-activation-file:
# when: manual
# stage: activation
# script:
# - chmod +x ./ci/get_activation_file.sh && ./ci/get_activation_file.sh
# artifacts:
# paths:
# - $UNITY_ACTIVATION_FILE
# expire_in: 10 min # Expiring this as artifacts may contain sensitive data and should not be kept public
determine-version:
only:
- master
- develop
- tags
- merge_requests
stage: test
image: ubuntu:18.04
script:
- chmod +x ./ci/get_activation_file.sh && ./ci/get_activation_file.sh
- apt-get update && apt-get -y install git
- chmod +x ./ci/get_version.sh && APP_VERSION=`./ci/get_version.sh` && export APP_VERSION
- echo -n $APP_VERSION > version.txt
artifacts:
paths:
- $UNITY_ACTIVATION_FILE
expire_in: 10 min # Expiring this as artifacts may contain sensitive data and should not be kept public
- version.txt
# base job for running tests
.test: &test
stage: build_and_test
stage: test
<<: *unity_before_script
<<: *cache
only:
- branches
- tags
- merge_requests
script:
- chmod +x ./ci/test.sh && ./ci/test.sh
- chmod +x ./ci/nunitToJunit/NUnitToJUnit && ./ci/nunitToJunit/NUnitToJUnit $(pwd)/$TEST_PLATFORM-results.xml $(pwd)/$TEST_PLATFORM-results-junit.xml
......@@ -50,18 +73,143 @@ get-activation-file:
junit: $(pwd)/$TEST_PLATFORM-results-junit.xml
coverage: /<Linecoverage>(.*?)</Linecoverage>/
# job for testing playmode tests (on the Linux runner)
test-playmode:
<<: *test
variables:
TEST_PLATFORM: playmode
# job for testing editmode tests (on the Linux runner)
test-editmode:
<<: *test
variables:
TEST_PLATFORM: editmode
# uncomment and run this job when you need to request a license
# you may need to follow activation steps from documentation
#get-windows-activation-file:
# when: manual
# stage: activation
# script:
# - ci\get_windows_activation_file.bat
# artifacts:
# paths:
# - artifacts
# expire_in: 10 min # Expiring this as artifacts may contain sensitive data and should not be kept public
# tags:
# - windows
# job for building the HoloLens 1 installers
hololens1-installer-build:
stage: build
only:
- tags
- master
- develop
cache:
key: "$CI_PROJECT_NAMESPACE-$CI_PROJECT_NAME-$CI_COMMIT_REF_SLUG-$TEST_PLATFORM-windows"
paths:
- Library/
dependencies:
- determine-version
script:
- 'set /p APP_VERSION=<version.txt'
- 'echo|set /p jobId="%CI_JOB_ID%" > h1id.txt'
- 'call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\Tools\VsDevCmd.bat" -app_platform=UWP -host_arch=amd64'
- 'call ci\build.bat'
- 'call msbuild.exe .\Builds\WSAPlayer\MirageXR\MirageXR.sln /p:Configuration=Release /p:Platform="x86" /p:AppxBundle=Always;AppxBundlePlatforms="x86" /p:UseSubFolderForOutputDirDuringMultiPlatformBuild=false'
- 'mkdir HoloLens1-Installer'
- 'xcopy /S /Y "Builds\WSAPlayer\MirageXR\AppPackages\MirageXR" "HoloLens1-Installer"'
artifacts:
paths:
- HoloLens1-Installer
- h1id.txt
tags:
- windows
# job for building the HoloLens 2 installers
hololens2-installer-build:
stage: build
only:
- tags