From aa7343f56a933e186fef4fa348b74013d07ff257 Mon Sep 17 00:00:00 2001 From: ashwini Date: Tue, 24 Sep 2019 12:01:58 -0400 Subject: [PATCH 1/2] Use slough macs --- .yamato/build_android.yml | 4 ++-- .yamato/build_osx_classlibs.yml | 2 +- .yamato/build_osx_runtime.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.yamato/build_android.yml b/.yamato/build_android.yml index 7f3f83aea38d..7607b993bd66 100644 --- a/.yamato/build_android.yml +++ b/.yamato/build_android.yml @@ -1,8 +1,8 @@ -name: build_android +git submodule name: build_android agent: type: Unity::VM::osx - image: buildfarm/mac:stable + image: platform-foundation/mac-bokken:latest flavor: m1.mac commands: diff --git a/.yamato/build_osx_classlibs.yml b/.yamato/build_osx_classlibs.yml index c9fd702ae21d..62a87400a059 100644 --- a/.yamato/build_osx_classlibs.yml +++ b/.yamato/build_osx_classlibs.yml @@ -2,7 +2,7 @@ name: build_osx_classlibs agent: type: Unity::VM::osx - image: buildfarm/mac:latest + image: platform-foundation/mac-bokken:latest flavor: m1.mac commands: diff --git a/.yamato/build_osx_runtime.yml b/.yamato/build_osx_runtime.yml index b6d26b500d48..d525dd9c4d36 100644 --- a/.yamato/build_osx_runtime.yml +++ b/.yamato/build_osx_runtime.yml @@ -2,7 +2,7 @@ name: build_osx_runtime agent: type: Unity::VM::osx - image: buildfarm/mac:latest + image: platform-foundation/mac-bokken:latest flavor: m1.mac commands: From dc8d53c95a3c07368e0806f4be6687cbbeeefc28 Mon Sep 17 00:00:00 2001 From: ashwini Date: Tue, 24 Sep 2019 15:18:16 -0400 Subject: [PATCH 2/2] Use new linux image with pre-installed things --- .yamato/build_android.yml | 2 +- .yamato/build_linux_x64.yml | 2 +- .yamato/build_linux_x86.sh | 12 ------------ .yamato/build_linux_x86.yml | 2 +- 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/.yamato/build_android.yml b/.yamato/build_android.yml index 7607b993bd66..3cf61a9036bd 100644 --- a/.yamato/build_android.yml +++ b/.yamato/build_android.yml @@ -1,4 +1,4 @@ -git submodule name: build_android +name: build_android agent: type: Unity::VM::osx diff --git a/.yamato/build_linux_x64.yml b/.yamato/build_linux_x64.yml index dae6f068a627..d3781cd3f4f6 100644 --- a/.yamato/build_linux_x64.yml +++ b/.yamato/build_linux_x64.yml @@ -2,7 +2,7 @@ name: build_linux_x64 agent: type: Unity::VM - image: cds-ops/ubuntu-18.04-agent:v1.0.11-765607 + image: platform-foundation/linux-ubuntu-18.04-mono-bokken:latest flavor: b1.large commands: diff --git a/.yamato/build_linux_x86.sh b/.yamato/build_linux_x86.sh index a5fefe36ad2d..d64965481989 100755 --- a/.yamato/build_linux_x86.sh +++ b/.yamato/build_linux_x86.sh @@ -1,15 +1,3 @@ -sudo dpkg --add-architecture i386 -sudo DEBIAN_FRONTEND=noninteractive apt-get -qy update -sudo apt-get install -y schroot -sudo apt-get install -y binutils debootstrap -sudo apt-get install -y m4 -sudo apt-get install -y libc6-i386 -sudo apt-get install -y libc6-dev-i386 -sudo apt-get install -y zlib1g:i386 -sudo apt-get install -y zlib1g-dev:i386 -sudo apt-get install -y libstdc++6:i386 -sudo apt-get install -y libncurses5:i386 -sudo apt-get install -y libncurses5-dev:i386 git submodule update --init --recursive export UNITY_THISISABUILDMACHINE=1 # try again in case previous update failed diff --git a/.yamato/build_linux_x86.yml b/.yamato/build_linux_x86.yml index 4ed82608c0d6..ca7c624e45ac 100644 --- a/.yamato/build_linux_x86.yml +++ b/.yamato/build_linux_x86.yml @@ -2,7 +2,7 @@ name: build_linux_x86 agent: type: Unity::VM - image: cds-ops/ubuntu-18.04-agent:v1.0.11-765607 + image: platform-foundation/linux-ubuntu-18.04-mono-bokken:latest flavor: b1.large commands: