Skip to content

[Yamato] Update mac image #1695

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Aug 31, 2020
Merged

[Yamato] Update mac image #1695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6d3a5e3
switch from buildfarm/mac to package-ci/mac
Aug 14, 2020
ce60ace
trying slough-ops/macos-10.15-vanilla
Aug 14, 2020
2e2c414
slough-ops/macos-10.14-xcode:stable
Aug 14, 2020
41def6a
cds-ops/mac-1013-buildfarm-base:latest
Aug 14, 2020
bd407da
cds-ops/macos-10.14-perf:latest
Aug 14, 2020
757f856
switch back to package-ci/mac:stable
Aug 17, 2020
1a90fdc
Merge branch 'master' into yamato/update-mac-image
Aug 28, 2020
00a3e1a
Update readme.md
Aug 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .yamato/config/__shared.metafile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ platforms:
agents_project_OpenGLCore:
default:
type: Unity::VM::osx
image: buildfarm/mac:stable
image: package-ci/mac:stable
flavor: m1.mac
agent_package:
type: Unity::VM::osx
Expand Down
2 changes: 1 addition & 1 deletion .yamato/docs/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ platforms:
agents_project_OpenGLCore: # agents used by all OSX OpenGLCore project jobs
default:
type: Unity::VM::osx
image: buildfarm/mac:stable
image: package-ci/mac:stable
flavor: m1.mac
agent_package:
type: Unity::VM::osx
Expand Down
12 changes: 6 additions & 6 deletions .yamato/shadergraph-osx-openglcore.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ShaderGraph_OSX_OpenGLCore_playmode_trunk:
name: ShaderGraph on OSX_OpenGLCore_playmode on version trunk
agent:
type: Unity::VM::osx
image: buildfarm/mac:stable
image: package-ci/mac:stable
flavor: m1.mac
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
Expand All @@ -28,7 +28,7 @@ ShaderGraph_OSX_OpenGLCore_editmode_trunk:
name: ShaderGraph on OSX_OpenGLCore_editmode on version trunk
agent:
type: Unity::VM::osx
image: buildfarm/mac:stable
image: package-ci/mac:stable
flavor: m1.mac
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
Expand All @@ -49,7 +49,7 @@ ShaderGraph_OSX_OpenGLCore_playmode_fast-trunk:
name: ShaderGraph on OSX_OpenGLCore_playmode on version fast-trunk
agent:
type: Unity::VM::osx
image: buildfarm/mac:stable
image: package-ci/mac:stable
flavor: m1.mac
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
Expand All @@ -70,7 +70,7 @@ ShaderGraph_OSX_OpenGLCore_editmode_fast-trunk:
name: ShaderGraph on OSX_OpenGLCore_editmode on version fast-trunk
agent:
type: Unity::VM::osx
image: buildfarm/mac:stable
image: package-ci/mac:stable
flavor: m1.mac
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
Expand All @@ -91,7 +91,7 @@ ShaderGraph_OSX_OpenGLCore_playmode_CUSTOM-REVISION:
name: ShaderGraph on OSX_OpenGLCore_playmode on version CUSTOM-REVISION
agent:
type: Unity::VM::osx
image: buildfarm/mac:stable
image: package-ci/mac:stable
flavor: m1.mac
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
Expand All @@ -113,7 +113,7 @@ ShaderGraph_OSX_OpenGLCore_editmode_CUSTOM-REVISION:
name: ShaderGraph on OSX_OpenGLCore_editmode on version CUSTOM-REVISION
agent:
type: Unity::VM::osx
image: buildfarm/mac:stable
image: package-ci/mac:stable
flavor: m1.mac
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
Expand Down
18 changes: 9 additions & 9 deletions .yamato/universal-osx-openglcore.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Universal_OSX_OpenGLCore_playmode_trunk:
name: Universal on OSX_OpenGLCore_playmode on version trunk
agent:
type: Unity::VM::osx
image: buildfarm/mac:stable
image: package-ci/mac:stable
flavor: m1.mac
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
Expand All @@ -28,7 +28,7 @@ Universal_OSX_OpenGLCore_editmode_trunk:
name: Universal on OSX_OpenGLCore_editmode on version trunk
agent:
type: Unity::VM::osx
image: buildfarm/mac:stable
image: package-ci/mac:stable
flavor: m1.mac
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
Expand All @@ -49,7 +49,7 @@ Universal_OSX_OpenGLCore_playmode_XR_trunk:
name: Universal on OSX_OpenGLCore_playmode_XR on version trunk
agent:
type: Unity::VM::osx
image: buildfarm/mac:stable
image: package-ci/mac:stable
flavor: m1.mac
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
Expand All @@ -70,7 +70,7 @@ Universal_OSX_OpenGLCore_playmode_fast-trunk:
name: Universal on OSX_OpenGLCore_playmode on version fast-trunk
agent:
type: Unity::VM::osx
image: buildfarm/mac:stable
image: package-ci/mac:stable
flavor: m1.mac
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
Expand All @@ -91,7 +91,7 @@ Universal_OSX_OpenGLCore_editmode_fast-trunk:
name: Universal on OSX_OpenGLCore_editmode on version fast-trunk
agent:
type: Unity::VM::osx
image: buildfarm/mac:stable
image: package-ci/mac:stable
flavor: m1.mac
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
Expand All @@ -112,7 +112,7 @@ Universal_OSX_OpenGLCore_playmode_XR_fast-trunk:
name: Universal on OSX_OpenGLCore_playmode_XR on version fast-trunk
agent:
type: Unity::VM::osx
image: buildfarm/mac:stable
image: package-ci/mac:stable
flavor: m1.mac
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
Expand All @@ -133,7 +133,7 @@ Universal_OSX_OpenGLCore_playmode_CUSTOM-REVISION:
name: Universal on OSX_OpenGLCore_playmode on version CUSTOM-REVISION
agent:
type: Unity::VM::osx
image: buildfarm/mac:stable
image: package-ci/mac:stable
flavor: m1.mac
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
Expand All @@ -155,7 +155,7 @@ Universal_OSX_OpenGLCore_editmode_CUSTOM-REVISION:
name: Universal on OSX_OpenGLCore_editmode on version CUSTOM-REVISION
agent:
type: Unity::VM::osx
image: buildfarm/mac:stable
image: package-ci/mac:stable
flavor: m1.mac
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
Expand All @@ -177,7 +177,7 @@ Universal_OSX_OpenGLCore_playmode_XR_CUSTOM-REVISION:
name: Universal on OSX_OpenGLCore_playmode_XR on version CUSTOM-REVISION
agent:
type: Unity::VM::osx
image: buildfarm/mac:stable
image: package-ci/mac:stable
flavor: m1.mac
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
Expand Down
6 changes: 3 additions & 3 deletions .yamato/vfx_urp-osx-openglcore.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ VFX_URP_OSX_OpenGLCore_playmode_trunk:
name: VFX_URP on OSX_OpenGLCore_playmode on version trunk
agent:
type: Unity::VM::osx
image: buildfarm/mac:stable
image: package-ci/mac:stable
flavor: m1.mac
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
Expand All @@ -28,7 +28,7 @@ VFX_URP_OSX_OpenGLCore_playmode_fast-trunk:
name: VFX_URP on OSX_OpenGLCore_playmode on version fast-trunk
agent:
type: Unity::VM::osx
image: buildfarm/mac:stable
image: package-ci/mac:stable
flavor: m1.mac
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
Expand All @@ -49,7 +49,7 @@ VFX_URP_OSX_OpenGLCore_playmode_CUSTOM-REVISION:
name: VFX_URP on OSX_OpenGLCore_playmode on version CUSTOM-REVISION
agent:
type: Unity::VM::osx
image: buildfarm/mac:stable
image: package-ci/mac:stable
flavor: m1.mac
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
Expand Down