Skip to content
This repository was archived by the owner on Oct 20, 2021. It is now read-only.

Commit a0d0442

Browse files
author
Jamie Brynes
authored
Unity 2020.1 Upgrade (#122)
1 parent eff27d8 commit a0d0442

File tree

7 files changed

+34
-21
lines changed

7 files changed

+34
-21
lines changed

.buildkite/premerge.steps.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ windows: &windows
1313
- "environment=production"
1414
- "permission_set=builder"
1515
- "platform=windows"
16-
- "queue=${WINDOWS_BUILDER_QUEUE:-v4-20-07-30-165418-bk13785-82b83865-d}"
16+
- "queue=${WINDOWS_BUILDER_QUEUE:-v4-20-08-13-090826-bk14267-5f831930-d}"
1717
- "scaler_version=2"
1818
- "minimum_instances=1"
1919
- "agent_count=1"
@@ -33,8 +33,8 @@ windows: &windows
3333
# Workaround for flaky Git clones, likely due to - https://github.com/PowerShell/Win32-OpenSSH/issues/1322
3434
- exit_status: 128
3535
limit: 3
36-
env: &windows-env
37-
ACCELERATOR_ENDPOINT: "unity-accelerator.production-intinf-eu1.i8e.io"
36+
# env: &windows-env
37+
# ACCELERATOR_ENDPOINT: "unity-accelerator.production-intinf-eu1.i8e.io"
3838

3939
#macos: &macos
4040
# agents:
@@ -83,7 +83,7 @@ steps:
8383
artifact_paths:
8484
- logs/**/*
8585
env:
86-
<<: *windows-env
86+
# <<: *windows-env
8787
WORKER_TYPE: "MobileClient"
8888
BUILD_ENVIRONMENT: "local"
8989
BUILD_TARGET_FILTER: "android"
@@ -108,7 +108,7 @@ steps:
108108
artifact_paths:
109109
- logs/**/*
110110
env:
111-
<<: *windows-env
111+
# <<: *windows-env
112112
WORKER_TYPE: "UnityClient"
113113
BUILD_ENVIRONMENT: "cloud"
114114
SCRIPTING_BACKEND: "mono"
@@ -119,7 +119,7 @@ steps:
119119
artifact_paths:
120120
- logs/**/*
121121
env:
122-
<<: *windows-env
122+
# <<: *windows-env
123123
WORKER_TYPE: "UnityClient"
124124
BUILD_ENVIRONMENT: "local"
125125
SCRIPTING_BACKEND: "il2cpp"
@@ -130,7 +130,7 @@ steps:
130130
artifact_paths:
131131
- logs/**/*
132132
env:
133-
<<: *windows-env
133+
# <<: *windows-env
134134
WORKER_TYPE: "UnityGameLogic"
135135
BUILD_ENVIRONMENT: "cloud"
136136
SCRIPTING_BACKEND: "mono"

.buildkite/release-qa.steps.yaml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ windows: &windows
1313
- "environment=production"
1414
- "permission_set=builder"
1515
- "platform=windows"
16-
- "queue=${WINDOWS_BUILDER_QUEUE:-v4-20-07-30-165418-bk13785-82b83865-d}"
16+
- "queue=${WINDOWS_BUILDER_QUEUE:-v4-20-08-13-090826-bk14267-5f831930-d}"
1717
- "scaler_version=2"
1818
- "minimum_instances=1"
1919
- "agent_count=1"
@@ -33,8 +33,8 @@ windows: &windows
3333
# Workaround for flaky Git clones, likely due to - https://github.com/PowerShell/Win32-OpenSSH/issues/1322
3434
- exit_status: 128
3535
limit: 3
36-
env: &windows-env
37-
ACCELERATOR_ENDPOINT: "unity-accelerator.production-intinf-eu1.i8e.io"
36+
# env: &windows-env
37+
# ACCELERATOR_ENDPOINT: "unity-accelerator.production-intinf-eu1.i8e.io"
3838

3939
# NOTE: step labels turn into commit-status names like {org}/{repo}/{pipeline}/{step-label}, lower-case and hyphenated.
4040
# These are then relied on to have stable names by other things, so once named, please beware renaming has consequences.
@@ -47,7 +47,7 @@ steps:
4747
- logs/**/*
4848
- build/assembly/**/*
4949
env:
50-
<<: *windows-env
50+
# <<: *windows-env
5151
WORKER_TYPE: "MobileClient"
5252
BUILD_ENVIRONMENT: "local"
5353
BUILD_TARGET_FILTER: "android"
@@ -60,7 +60,7 @@ steps:
6060
- logs/**/*
6161
- build/assembly/**/*
6262
env:
63-
<<: *windows-env
63+
# <<: *windows-env
6464
WORKER_TYPE: "MobileClient"
6565
BUILD_ENVIRONMENT: "local"
6666
BUILD_TARGET_FILTER: "ios"
@@ -73,7 +73,7 @@ steps:
7373
- logs/**/*
7474
- build/assembly/**/*
7575
env:
76-
<<: *windows-env
76+
# <<: *windows-env
7777
WORKER_TYPE: "UnityClient"
7878
BUILD_ENVIRONMENT: "cloud"
7979
SCRIPTING_BACKEND: "mono"
@@ -85,11 +85,13 @@ steps:
8585
- logs/**/*
8686
- build/assembly/**/*
8787
env:
88-
<<: *windows-env
88+
# <<: *windows-env
8989
WORKER_TYPE: "UnityGameLogic"
9090
BUILD_ENVIRONMENT: "cloud"
9191
SCRIPTING_BACKEND: "mono"
92+
9293
- wait
94+
9395
- label: Launch deployments
9496
command: bash -c ci/launch.sh
9597
<<: *windows

gdk.pinned

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
develop 6b8e88650b7132c83120ce642e2fd39b7f63e846
1+
develop 9d642b99e7444549ff2a4d3f8dc5506a601f475b

workers/unity/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,5 @@
2424
# Jetbrains
2525
/Assets/Plugins/Editor/Jetbrains
2626
/Assets/Plugins/Editor/Jetbrains.meta
27+
28+
/Packages/packages-lock.json

workers/unity/Packages/manifest.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
{
22
"dependencies": {
3-
"com.unity.ide.rider": "1.1.4",
4-
"com.unity.quicksearch": "2.0.0",
5-
"com.unity.test-framework": "1.1.11",
6-
"com.unity.timeline": "1.2.10",
3+
"com.unity.ide.rider": "2.0.7",
4+
"com.unity.ide.visualstudio": "2.0.2",
5+
"com.unity.quicksearch": "2.0.2",
6+
"com.unity.test-framework": "1.1.16",
7+
"com.unity.timeline": "1.3.5",
78
"com.unity.ugui": "1.0.0",
89
"io.improbable.gdk.buildsystem": "0.3.10",
910
"io.improbable.gdk.core": "0.3.10",
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2019.3.7f1
2-
m_EditorVersionWithRevision: 2019.3.7f1 (6437fd74d35d)
1+
m_EditorVersion: 2020.1.2f1
2+
m_EditorVersionWithRevision: 2020.1.2f1 (7b32bc54ba47)
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!890905787 &1
4+
VersionControlSettings:
5+
m_ObjectHideFlags: 0
6+
m_Mode: Visible Meta Files
7+
m_CollabEditorSettings:
8+
inProgressEnabled: 1

0 commit comments

Comments
 (0)