Fix yamato building on master

Author: shana

.yamato/build.yml

@@ -12,18 +12,9 @@ build:
   commands:
     - powershell scripts\Get-Deps.ps1
     - npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm
-    - |
-      set RELEASE=0
-      if "x%GIT_TAG%"!==!"x" set RELEASE=1
-      if "%RELEASE%"=="1" (build -r -p) else (build -r)
-    - |
-      set RELEASE=0
-      if "x%GIT_TAG%"!==!"x" set RELEASE=1
-      if "%RELEASE%"=="1" (test -r -p) else (test -r)
-    - |
-      set RELEASE=0
-      if "x%GIT_TAG%"!==!"x" set RELEASE=1
-      if "%RELEASE%"=="1" (pack -r -p -u) else (pack -r -u)
+    - build.cmd
+    - test.cmd
+    - pack.cmd -u
 
   artifacts:
     nuget:

.yamato/publish.yml

@@ -32,7 +32,9 @@ publish_npm:
     AUTH_URL: https://artifactory.internal.unity3d.com/api/npm/auth
 
   commands:
-    - curl -u%ARTIFACTORY% %AUTH_URL%/auth > %USERPROFILE%\.npmrc
+    - |
+      @echo off
+      curl -u%ARTIFACTORY% %AUTH_URL% > %USERPROFILE%\.npmrc
     - for /f "delims=" %%d in ('dir /b "upm-ci~\packages\*.tgz"') do (call npm publish "upm-ci~\packages\%%d" --quiet --registry %PUBLISH_URL%)
 
   dependencies:

.yamato/test.yml

@@ -8,8 +8,6 @@ test_{{ platform.name }}_{{ editor.version }}:
     type: {{ platform.type }}
     image: {{ platform.image }}
     flavor: {{ platform.flavor}}
-  variables:
-    DOTNET_CLI_TELEMETRY_OPTOUT: 1
 
   commands:
     - npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm

build.cmd

@@ -1,6 +1,10 @@
 @echo off
 setlocal
 
+if NOT "x%YAMATO_JOB_ID%"=="x" set GITLAB_CI=1
+if NOT "x%YAMATO_JOB_ID%"=="x" set CI_COMMIT_TAG=%GIT_TAG%
+if NOT "x%YAMATO_JOB_ID%"=="x" set CI_COMMIT_REF_NAME=%GIT_BRANCH%
+
 SET CONFIGURATION=Release
 SET PUBLIC=""
 SET BUILD=0

build.sh

@@ -39,6 +39,9 @@ while (( "$#" )); do
       echo "Error: Unsupported flag $1" >&2
       exit 1
       ;;
+    *)
+      shift
+    ;;
   esac
 done
 

pack.cmd

@@ -1,6 +1,10 @@
 @echo off
 setlocal
 
+if NOT "x%YAMATO_JOB_ID%"=="x" set GITLAB_CI=1
+if NOT "x%YAMATO_JOB_ID%"=="x" set CI_COMMIT_TAG=%GIT_TAG%
+if NOT "x%YAMATO_JOB_ID%"=="x" set CI_COMMIT_REF_NAME=%GIT_BRANCH%
+
 SET CONFIGURATION=Release
 SET PUBLIC=""
 SET BUILD=0

pack.sh

@@ -39,6 +39,9 @@ while (( "$#" )); do
       echo "Error: Unsupported flag $1" >&2
       exit 1
       ;;
+    *)
+      shift
+    ;;
   esac
 done
 

scripts/Test-Upm.ps1

@@ -1,5 +1,7 @@
 [CmdletBinding()]
 Param(
+    [string]
+    $UnityVersion = "2019.2",
     [switch]
     $Trace = $false
 )
@@ -17,5 +19,5 @@ Get-ChildItem -Directory $upmDir | % {
     Write-Output "Testing $($_.Name)"
 
     $packageDir = Join-Path $upmDir $_.Name
-    Invoke-Command -Fatal { & upm-ci package test --package-path $packageDir -u 2019.2 }
+    Invoke-Command -Fatal { & upm-ci package test --package-path $packageDir -u $UnityVersion }
 }

test.cmd

@@ -1,10 +1,15 @@
 @echo off
 setlocal
 
+if NOT "x%YAMATO_JOB_ID%"=="x" set GITLAB_CI=1
+if NOT "x%YAMATO_JOB_ID%"=="x" set CI_COMMIT_TAG=%GIT_TAG%
+if NOT "x%YAMATO_JOB_ID%"=="x" set CI_COMMIT_REF_NAME=%GIT_BRANCH%
+
 SET CONFIGURATION=Release
 SET PUBLIC=""
 SET BUILD=0
 set UPM=0
+set UNITYVERSION=2019.2
 
 :loop
 IF NOT "%1"=="" (
@@ -34,9 +39,13 @@ IF NOT "%1"=="" (
     )
     IF "%1"=="-u" (
         SET UPM=1
+        SHIFT
+        SET UNITYVERSION=%1
     )
     IF "%1"=="--upm" (
         SET UPM=1
+        SHIFT
+        SET UNITYVERSION=%1
     )
     SHIFT
     GOTO :loop
@@ -46,8 +55,8 @@ if "x%BUILD%"=="x1" (
 	dotnet restore
 	dotnet build --no-restore -c %CONFIGURATION% %PUBLIC%
 )
-dotnet test --no-build --no-restore -c %CONFIGURATION% %PUBLIC% --logger "trx;LogFileName=dotnet-test-result.trx" --logger "html;LogFileName=dotnet-test-result.html"
+dotnet test --no-build --no-restore -c %CONFIGURATION% %PUBLIC% --logger "trx;LogFileName=dotnet-test-result.trx"
 
 if "x%UPM%"=="x1" (
-  call powershell scripts/Test-Upm.ps1
+  call powershell scripts/Test-Upm.ps1 -UnityVersion %UNITYVERSION%
 )

test.sh

@@ -12,6 +12,7 @@ CONFIGURATION=Release
 PUBLIC=""
 BUILD=0
 UPM=0
+UNITYVERSION=2019.2
 
 while (( "$#" )); do
   case "$1" in
@@ -34,11 +35,16 @@ while (( "$#" )); do
     -u|--upm)
       UPM=1
       shift
+      UNITYVERSION=$1
+      shift
     ;;
     -*|--*=) # unsupported flags
       echo "Error: Unsupported flag $1" >&2
       exit 1
       ;;
+    *)
+      shift
+    ;;
   esac
 done
 
@@ -55,7 +61,7 @@ fi
 dotnet test --no-build --no-restore -c $CONFIGURATION $PUBLIC --logger "trx;LogFileName=dotnet-test-result.trx" --logger "html;LogFileName=dotnet-test-result.html"
 
 if [[ x"$UPM" == x"1" ]]; then
-  powershell scripts/Test-Upm.ps1
+  powershell scripts/Test-Upm.ps1 -UnityVersion $UNITYVERSION
 fi
 
 popd >/dev/null 2>&1