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

Commit 12877b7c authored by bokisjov@gmail.com's avatar bokisjov@gmail.com

Merge branch 'Release_1.8' into 'master'

Release 1.8

See merge request !414
parents 66025e0c e46cd33a
Pipeline #3478 passed with stages
in 184 minutes and 3 seconds

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
......@@ -95,3 +95,7 @@ Assets/**/obj/**
/Assets/MirageXR/Common/Resources/Credentials.meta
/.vsconfig
/Assets/Common/obj.meta
#IBM Watson Assistant keys
/Assets/Resources/ibm-credentials.txt
/Assets/Resources/ibm-credentials.txt.meta
\ No newline at end of file
stages:
- activation
- test
- build
- deploy
variables:
BUILD_NAME: MirageXR
UNITY_VERSION: 2020.3.13f1
UNITY_ACTIVATION_FILE: ./Unity_v$UNITY_VERSION.alf
IMAGE: unityci/editor # https://hub.docker.com/r/unityci/editor
IMAGE_VERSION: "0.13.0" # https://hub.docker.com/r/unityci/editor
UNITY_DIR: $CI_PROJECT_DIR # this needs to be an absolute path. Defaults to the root of your tree.
image: $IMAGE:$UNITY_VERSION-base-$IMAGE_VERSION
.unity_before_script: &unity_before_script
before_script:
- TXT_RED="\033[31m" && TXT_CLEAR="\033[0m" && TXT_GREEN="\033[32m"
- chmod +x ./ci/before_script.sh && ./ci/before_script.sh
.cache: &cache
cache:
key: "$CI_PROJECT_NAMESPACE-$CI_PROJECT_NAME-$CI_COMMIT_REF_SLUG-$TEST_PLATFORM"
paths:
- $UNITY_DIR/Library/
# uncomment and run this job when you need to request a license
# you may need to follow activation steps from documentation
#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:
- 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:
- version.txt
expire_in: 1 day
# base job for running tests
#.test: &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
# artifacts:
# when: always
# paths:
# - $(pwd)/$TEST_PLATFORM-results.xml
# - $(pwd)/$TEST_PLATFORM-results-junit.xml
# - $(pwd)/$TEST_PLATFORM-coverage/
# reports:
# junit: $(pwd)/$TEST_PLATFORM-results-junit.xml
# expire_in: 1 day
# 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: