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

Commit ba6608a

Browse files
author
Jamie Brynes
authored
Upgrade to 2020.1 (#291)
1 parent 76f6eee commit ba6608a

File tree

6 files changed

+21
-20
lines changed

6 files changed

+21
-20
lines changed

.buildkite/premerge.steps.yaml

Lines changed: 8 additions & 8 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
linux: &linux
4040
agents:
@@ -105,7 +105,7 @@ steps:
105105
artifact_paths:
106106
- logs/**/*
107107
env:
108-
<<: *windows-env
108+
# <<: *windows-env
109109
WORKER_TYPE: "MobileClient"
110110
BUILD_ENVIRONMENT: "local"
111111
BUILD_TARGET_FILTER: "android"
@@ -130,7 +130,7 @@ steps:
130130
artifact_paths:
131131
- logs/**/*
132132
env:
133-
<<: *windows-env
133+
# <<: *windows-env
134134
WORKER_TYPE: "UnityClient"
135135
BUILD_ENVIRONMENT: "cloud"
136136
SCRIPTING_BACKEND: "mono"
@@ -141,7 +141,7 @@ steps:
141141
artifact_paths:
142142
- logs/**/*
143143
env:
144-
<<: *windows-env
144+
# <<: *windows-env
145145
WORKER_TYPE: "UnityClient"
146146
BUILD_ENVIRONMENT: "local"
147147
SCRIPTING_BACKEND: "il2cpp"
@@ -152,7 +152,7 @@ steps:
152152
artifact_paths:
153153
- logs/**/*
154154
env:
155-
<<: *windows-env
155+
# <<: *windows-env
156156
WORKER_TYPE: "UnityGameLogic"
157157
BUILD_ENVIRONMENT: "cloud"
158158
SCRIPTING_BACKEND: "mono"
@@ -163,7 +163,7 @@ steps:
163163
artifact_paths:
164164
- logs/**/*
165165
env:
166-
<<: *windows-env
166+
# <<: *windows-env
167167
WORKER_TYPE: "SimulatedPlayerCoordinator"
168168
BUILD_ENVIRONMENT: "cloud"
169169
SCRIPTING_BACKEND: "mono"

.buildkite/release-qa.steps.yaml

Lines changed: 8 additions & 8 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.
@@ -53,7 +53,7 @@ steps:
5353
- logs/**/*
5454
- build/assembly/**/*
5555
env:
56-
<<: *windows-env
56+
# <<: *windows-env
5757
WORKER_TYPE: "MobileClient"
5858
BUILD_ENVIRONMENT: "local"
5959
BUILD_TARGET_FILTER: "android"
@@ -66,7 +66,7 @@ steps:
6666
- logs/**/*
6767
- build/assembly/**/*
6868
env:
69-
<<: *windows-env
69+
# <<: *windows-env
7070
WORKER_TYPE: "MobileClient"
7171
BUILD_ENVIRONMENT: "local"
7272
BUILD_TARGET_FILTER: "ios"
@@ -79,7 +79,7 @@ steps:
7979
- logs/**/*
8080
- build/assembly/**/*
8181
env:
82-
<<: *windows-env
82+
# <<: *windows-env
8383
WORKER_TYPE: "UnityClient"
8484
BUILD_ENVIRONMENT: "cloud"
8585
SCRIPTING_BACKEND: "mono"
@@ -91,7 +91,7 @@ steps:
9191
- logs/**/*
9292
- build/assembly/**/*
9393
env:
94-
<<: *windows-env
94+
# <<: *windows-env
9595
WORKER_TYPE: "UnityGameLogic"
9696
BUILD_ENVIRONMENT: "cloud"
9797
SCRIPTING_BACKEND: "mono"
@@ -103,7 +103,7 @@ steps:
103103
- logs/**/*
104104
- build/assembly/**/*
105105
env:
106-
<<: *windows-env
106+
# <<: *windows-env
107107
WORKER_TYPE: "SimulatedPlayerCoordinator"
108108
BUILD_ENVIRONMENT: "cloud"
109109
SCRIPTING_BACKEND: "mono"

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/Packages/manifest.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"dependencies": {
3-
"com.unity.ide.rider": "1.1.4",
3+
"com.unity.ide.rider": "2.0.7",
4+
"com.unity.ide.visualstudio": "2.0.2",
45
"com.unity.postprocessing": "2.3.0",
56
"com.unity.quicksearch": "2.0.0",
67
"com.unity.ugui": "1.0.0",
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)
4.03 KB
Binary file not shown.

0 commit comments

Comments
 (0)