Skip to content

Commit f5548f1

Browse files
committed
Change image registry to unityci/editor and update Unity versions
1 parent e9913bf commit f5548f1

File tree

1 file changed

+20
-26
lines changed

1 file changed

+20
-26
lines changed

.gitlab-ci.yml

+20-26
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ stages:
33
- build
44

55
variables:
6-
UNITY_COMMAND: "xvfb-run --auto-servernum --server-args='-screen 0 640x480x24' /opt/Unity/Editor/Unity -batchmode -nographics -logfile /dev/stdout -quit"
6+
UNITY_COMMAND: "xvfb-run --auto-servernum --server-args='-screen 0 640x480x24' /opt/unity/Editor/Unity -batchmode -nographics -logfile /dev/stdout -quit"
77
BUILD_SCENE_PATH: 'Assets/HTC.UnityPlugin/ViveInputUtility/Examples/1.UGUI/UGUI.unity'
88
BUILD_OUTPUT_FOLDER: 'Builds/Win64'
99
BUILD_OUTPUT_NAME: 'UGUI.exe'
@@ -15,7 +15,7 @@ variables:
1515
eval ${UNITY_COMMAND} -returnLicense
1616

1717
.unity_template: &unity_template
18-
image: gableroux/unity3d:${IMAGE_TAG}
18+
image: unityci/editor:${IMAGE_TAG}
1919
cache:
2020
key: "${CI_PROJECT_ID}-${CI_COMMIT_REF_SLUG}-${CI_JOB_NAME}"
2121
paths:
@@ -58,86 +58,80 @@ variables:
5858
- find './Assets/HTC.UnityPlugin/' -type f -name '*.asmref*' -delete
5959
- *unity_activate
6060

61-
editor:2017.4-asset:
62-
<<: *no_asmdef_unity_template
63-
stage: editor
64-
variables:
65-
IMAGE_TAG: '2017.4.27f1-windows'
66-
6761
editor:2018.2-asset:
6862
<<: *no_asmdef_unity_template
6963
stage: editor
7064
variables:
71-
IMAGE_TAG: '2018.2.21f1-windows'
65+
IMAGE_TAG: '2018.2.21f1-windows-mono-0'
7266

7367
editor:2018.4-asset:
7468
<<: *no_asmdef_unity_template
7569
stage: editor
7670
variables:
77-
IMAGE_TAG: '2018.4.24f1-windows'
71+
IMAGE_TAG: '2018.4.32f1-windows-mono-0'
7872

79-
editor:2019.1-asset:
73+
editor:2019.2-asset:
8074
<<: *no_asmdef_unity_template
8175
stage: editor
8276
variables:
83-
IMAGE_TAG: '2019.1.14f1-windows'
77+
IMAGE_TAG: '2019.2.21f1-windows-mono-0'
8478

8579
editor:2019.4-asset:
8680
<<: *no_asmdef_unity_template
8781
stage: editor
8882
variables:
89-
IMAGE_TAG: '2019.4.2f1-windows'
83+
IMAGE_TAG: '2019.4.22f1-windows-mono-0'
9084

91-
editor:2020.1-asset:
85+
editor:2020.3-asset:
9286
<<: *no_asmdef_unity_template
9387
stage: editor
9488
variables:
95-
IMAGE_TAG: '2020.1.0f1-windows'
89+
IMAGE_TAG: '2020.3.0f1-windows-mono-0'
9690

9791
editor:2019.4-package:
9892
<<: *unity_template
9993
stage: editor
10094
variables:
101-
IMAGE_TAG: '2019.4.2f1-windows'
95+
IMAGE_TAG: '2019.4.22f1-windows-mono-0'
10296

103-
editor:2020.1-package:
97+
editor:2020.3-package:
10498
<<: *unity_template
10599
stage: editor
106100
variables:
107-
IMAGE_TAG: '2020.1.0f1-windows'
101+
IMAGE_TAG: '2020.3.0f1-windows-mono-0'
108102

109103
build:2018.4-asset-win64:
110104
<<: *no_asmdef_build_win64_unity_template
111105
stage: build
112106
variables:
113-
IMAGE_TAG: '2018.4.24f1-windows'
107+
IMAGE_TAG: '2018.4.32f1-windows-mono-0'
114108

115109
build:2019.2-asset-win64:
116110
<<: *no_asmdef_build_win64_unity_template
117111
stage: build
118112
variables:
119-
IMAGE_TAG: '2019.2.20f1-windows'
113+
IMAGE_TAG: '2019.2.21f1-windows-mono-0'
120114

121115
build:2019.4-asset-win64:
122116
<<: *no_asmdef_build_win64_unity_template
123117
stage: build
124118
variables:
125-
IMAGE_TAG: '2019.4.2f1-windows'
119+
IMAGE_TAG: '2019.4.22f1-windows-mono-0'
126120

127-
build:2020.1-asset-win64:
121+
build:2020.3-asset-win64:
128122
<<: *no_asmdef_build_win64_unity_template
129123
stage: build
130124
variables:
131-
IMAGE_TAG: '2020.1.0f1-windows'
125+
IMAGE_TAG: '2020.3.0f1-windows-mono-0'
132126

133127
build:2019.4-package-win64:
134128
<<: *build_win64_unity_template
135129
stage: build
136130
variables:
137-
IMAGE_TAG: '2019.4.2f1-windows'
131+
IMAGE_TAG: '2019.4.22f1-windows-mono-0'
138132

139-
build:2020.1-package-win64:
133+
build:2020.3-package-win64:
140134
<<: *build_win64_unity_template
141135
stage: build
142136
variables:
143-
IMAGE_TAG: '2020.1.0f1-windows'
137+
IMAGE_TAG: '2020.3.0f1-windows-mono-0'

0 commit comments

Comments
 (0)