From 850c85bb7e685e43f43b820c6a0458c82516f88b Mon Sep 17 00:00:00 2001 From: Brian Taylor Date: Tue, 22 Feb 2022 19:30:56 -0500 Subject: [PATCH 1/4] Add yamato configurations for building and uploading artifact to Stevedore. --- .yamato/Globals.metafile | 2 ++ .yamato/build_and_publish_to_stevedore.yml | 7 ++++++ ...ild_and_publish_to_stevedore_linux_x64.yml | 22 +++++++++++++++++++ ...build_and_publish_to_stevedore_osx_x64.yml | 22 +++++++++++++++++++ ...build_and_publish_to_stevedore_windows.yml | 21 ++++++++++++++++++ ...d_and_publish_to_stevedore_windows_x64.yml | 20 +++++++++++++++++ .yamato/build_and_test_linux_x64.yml | 9 ++++++-- .yamato/build_and_test_osx_x64.yml | 9 ++++++-- ...windows.yml => build_and_test_windows.yml} | 11 +++++++--- ...x64.yml => build_and_test_windows_x64.yml} | 9 ++++++-- 10 files changed, 123 insertions(+), 9 deletions(-) create mode 100644 .yamato/Globals.metafile create mode 100644 .yamato/build_and_publish_to_stevedore.yml create mode 100644 .yamato/build_and_publish_to_stevedore_linux_x64.yml create mode 100644 .yamato/build_and_publish_to_stevedore_osx_x64.yml create mode 100644 .yamato/build_and_publish_to_stevedore_windows.yml create mode 100644 .yamato/build_and_publish_to_stevedore_windows_x64.yml rename .yamato/{build_windows.yml => build_and_test_windows.yml} (68%) rename .yamato/{build_windows_x64.yml => build_and_test_windows_x64.yml} (69%) diff --git a/.yamato/Globals.metafile b/.yamato/Globals.metafile new file mode 100644 index 00000000000000..12fabfc732ba0a --- /dev/null +++ b/.yamato/Globals.metafile @@ -0,0 +1,2 @@ +globals: + artifact_base_name: dotnet-runtime-unity \ No newline at end of file diff --git a/.yamato/build_and_publish_to_stevedore.yml b/.yamato/build_and_publish_to_stevedore.yml new file mode 100644 index 00000000000000..2164be676c4eb9 --- /dev/null +++ b/.yamato/build_and_publish_to_stevedore.yml @@ -0,0 +1,7 @@ +all: + name: Build and Publish To Stevedore + dependencies: + - .yamato/build_and_publish_to_stevedore_windows.yml + - .yamato/build_and_publish_to_stevedore_windows_x64.yml + - .yamato/build_and_publish_to_stevedore_osx_x64.yml + - .yamato/build_and_publish_to_stevedore_linux_x64.yml diff --git a/.yamato/build_and_publish_to_stevedore_linux_x64.yml b/.yamato/build_and_publish_to_stevedore_linux_x64.yml new file mode 100644 index 00000000000000..4a0c2bc256fb3b --- /dev/null +++ b/.yamato/build_and_publish_to_stevedore_linux_x64.yml @@ -0,0 +1,22 @@ +name: Build and Publish To Stevedore Linux x64 + +agent: + type: Unity::VM + image: platform-foundation/linux-ubuntu-18.04-mono-bokken:latest + flavor: b1.large + +dependencies: + - path: .yamato/build_and_test_linux_x64.yml + location: build + unzip: false + +commands: +# upload to stevedore + - curl -sSo StevedoreUpload "$STEVEDORE_UPLOAD_TOOL_LINUX_X64_URL" + - chmod +x StevedoreUpload + - ./StevedoreUpload --version-len=12 --repo=testing --version="$GIT_REVISION" build/* + +artifacts: + linux64: + paths: + - stevedore/artifactid.txt diff --git a/.yamato/build_and_publish_to_stevedore_osx_x64.yml b/.yamato/build_and_publish_to_stevedore_osx_x64.yml new file mode 100644 index 00000000000000..fd112b5a2fdb8a --- /dev/null +++ b/.yamato/build_and_publish_to_stevedore_osx_x64.yml @@ -0,0 +1,22 @@ +name: Build and Publish To Stevedore OSX x64 + +agent: + type: Unity::VM::osx + image: platform-foundation/mac-bokken:latest + flavor: m1.mac + +dependencies: + - path: .yamato/build_and_test_osx_x64.yml + location: build + unzip: false + +commands: +# upload to stevedore + - curl -sSo StevedoreUpload "$STEVEDORE_UPLOAD_TOOL_MAC_X64_URL" + - chmod +x StevedoreUpload + - ./StevedoreUpload --version-len=12 --repo=testing --version="$GIT_REVISION" build/* + +artifacts: + osx64: + paths: + - stevedore/artifactid.txt diff --git a/.yamato/build_and_publish_to_stevedore_windows.yml b/.yamato/build_and_publish_to_stevedore_windows.yml new file mode 100644 index 00000000000000..859f72744f50d2 --- /dev/null +++ b/.yamato/build_and_publish_to_stevedore_windows.yml @@ -0,0 +1,21 @@ +name: Build and Publish To Stevedore Windows x86 + +agent: + type: Unity::VM + image: platform-foundation/windows-vs2019-il2cpp-bokken:latest + flavor: b1.xlarge + +dependencies: + - path: .yamato/build_and_test_windows.yml + location: build + unzip: false + +commands: +# upload to stevedore + - curl -sSo StevedoreUpload.exe "%STEVEDORE_UPLOAD_TOOL_WINDOWS_X64_URL%" + - StevedoreUpload.exe --version-len=12 --repo=testing --version="%GIT_REVISION%" build\* + +artifacts: + win32: + paths: + - stevedore/artifactid.txt diff --git a/.yamato/build_and_publish_to_stevedore_windows_x64.yml b/.yamato/build_and_publish_to_stevedore_windows_x64.yml new file mode 100644 index 00000000000000..eb6e17293d489c --- /dev/null +++ b/.yamato/build_and_publish_to_stevedore_windows_x64.yml @@ -0,0 +1,20 @@ +name: Build and Publish To Stevedore Windows x64 + +agent: + type: Unity::VM + image: platform-foundation/windows-vs2019-il2cpp-bokken:latest + flavor: b1.xlarge + +dependencies: + - path: .yamato/build_and_test_windows_x64.yml + unzip: false + +commands: +# upload to stevedore + - curl -sSo StevedoreUpload.exe "%STEVEDORE_UPLOAD_TOOL_WINDOWS_X64_URL%" + - StevedoreUpload.exe --version-len=12 --repo=testing --version="%GIT_REVISION%" artifacts\unity\%ARTIFACT_FILENAME% + +artifacts: + win64: + paths: + - stevedore/artifactid.txt diff --git a/.yamato/build_and_test_linux_x64.yml b/.yamato/build_and_test_linux_x64.yml index c04811c9bd93dc..2f19e7f7802b20 100644 --- a/.yamato/build_and_test_linux_x64.yml +++ b/.yamato/build_and_test_linux_x64.yml @@ -1,3 +1,5 @@ +{% metadata_file .yamato/Globals.metafile %} +--- name: Build and Test Linux x64 agent: @@ -5,6 +7,9 @@ agent: image: platform-foundation/linux-ubuntu-18.04-mono-bokken:0.1.7-978398 flavor: b1.large +variables: + ARTIFACT_FILENAME: {{globals.artifact_base_name}}-linux-x64.7z + commands: - mkdir artifacts - curl https://public-stevedore.unity3d.com/r/public/7za-linux-x64/e6c75fb7ffda_e6a295cdcae3f74d315361883cf53f75141be2e739c020035f414a449d4876af.zip --output artifacts/7za-linux-x64.zip @@ -17,7 +22,7 @@ commands: cmake --build . - ./build.sh -subset clr+libs+libs -a x64 -c release -ci -ninja - cp unity/unitygc/release/libunitygc.so artifacts/bin/microsoft.netcore.app.runtime.linux-x64/Release/runtimes/linux-x64/native - - artifacts/7za-linux-x64/7za a artifacts/unity/dotnet-runtime-unity-linux-x64.7z ./artifacts/bin/microsoft.netcore.app.runtime.linux-x64/Release/runtimes/linux-x64 + - artifacts/7za-linux-x64/7za a artifacts/unity/$ARTIFACT_FILENAME ./artifacts/bin/microsoft.netcore.app.runtime.linux-x64/Release/runtimes/linux-x64 # build/run tests - ./build.sh -subset libs.tests -test -a x64 -c release -ci -ninja - command: ./src/tests/build.sh x64 release ci @@ -35,4 +40,4 @@ triggers: artifacts: linux64: paths: - - artifacts/unity/dotnet-runtime-unity-linux-x64.7z + - artifacts/unity/$ARTIFACT_FILENAME diff --git a/.yamato/build_and_test_osx_x64.yml b/.yamato/build_and_test_osx_x64.yml index a7e3ffc576fe42..ed6c908cd89d5f 100644 --- a/.yamato/build_and_test_osx_x64.yml +++ b/.yamato/build_and_test_osx_x64.yml @@ -1,3 +1,5 @@ +{% metadata_file .yamato/Globals.metafile %} +--- name: Build and Test OSX x64 agent: @@ -5,6 +7,9 @@ agent: image: platform-foundation/mac-bokken:latest flavor: m1.mac +variables: + ARTIFACT_FILENAME: {{globals.artifact_base_name}}-osx-x64.7z + commands: - mkdir artifacts - curl https://public-stevedore.unity3d.com/r/public/7za-mac-x64/e6c75fb7ffda_5bd76652986a0e3756d1cfd7e84ce056a9e1dbfc5f70f0514a001f724c0fbad2.zip --output artifacts/7za-mac-x64.zip @@ -17,7 +22,7 @@ commands: cmake --build . - LD_LIBRARY_PATH=/usr/local/opt/openssl/lib ./build.sh -subset clr+libs -a x64 -c release -ci -ninja - cp unity/unitygc/release/libunitygc.dylib artifacts/bin/microsoft.netcore.app.runtime.osx-x64/Release/runtimes/osx-x64/native - - artifacts/7za-mac-x64/7za a artifacts/unity/dotnet-runtime-unity-osx-x64.7z ./artifacts/bin/microsoft.netcore.app.runtime.osx-x64/Release/runtimes/osx-x64 + - artifacts/7za-mac-x64/7za a artifacts/unity/$ARTIFACT_FILENAME ./artifacts/bin/microsoft.netcore.app.runtime.osx-x64/Release/runtimes/osx-x64 # build/run tests - LD_LIBRARY_PATH=/usr/local/opt/openssl/lib ./build.sh -subset libs.tests -test -a x64 -c release -ci -ninja - ./src/tests/build.sh x64 release ci @@ -34,4 +39,4 @@ triggers: artifacts: osx64: paths: - - artifacts/unity/dotnet-runtime-unity-osx-x64.7z + - artifacts/unity/$ARTIFACT_FILENAME diff --git a/.yamato/build_windows.yml b/.yamato/build_and_test_windows.yml similarity index 68% rename from .yamato/build_windows.yml rename to .yamato/build_and_test_windows.yml index e8bd46bcc241c8..c94653919cecac 100644 --- a/.yamato/build_windows.yml +++ b/.yamato/build_and_test_windows.yml @@ -1,3 +1,5 @@ +{% metadata_file .yamato/Globals.metafile %} +--- name: Build and Test Windows x86 agent: @@ -5,6 +7,9 @@ agent: image: platform-foundation/windows-vs2019-il2cpp-bokken:latest flavor: b1.xlarge +variables: + ARTIFACT_FILENAME: {{globals.artifact_base_name}}-win-x86.7z + commands: - | cd unity\unitygc @@ -13,7 +18,7 @@ commands: - build.cmd -subset clr+libs -a x86 -c release -ci - copy unity\unitygc\Release\unitygc.dll artifacts\bin\microsoft.netcore.app.runtime.win-x86\Release\runtimes\win-x86\native - powershell .yamato\scripts\download_7z.ps1 - - artifacts\7za-win-x64\7za.exe a artifacts\unity\dotnet-runtime-unity-win-x86.7z .\artifacts\bin\microsoft.netcore.app.runtime.win-x86\Release\runtimes\win-x86 + - artifacts\7za-win-x64\7za.exe a artifacts\unity\%ARTIFACT_FILENAME% .\artifacts\bin\microsoft.netcore.app.runtime.win-x86\Release\runtimes\win-x86 # build/run tests - build.cmd libs.tests -test -a x86 -c release -ci - src\tests\build.cmd x86 release ci @@ -26,6 +31,6 @@ triggers: - "unity-main" artifacts: - win64: + win32: paths: - - artifacts\unity\dotnet-runtime-unity-win-x86.7z + - artifacts\unity\%ARTIFACT_FILENAME% diff --git a/.yamato/build_windows_x64.yml b/.yamato/build_and_test_windows_x64.yml similarity index 69% rename from .yamato/build_windows_x64.yml rename to .yamato/build_and_test_windows_x64.yml index 246e58a1bdd81e..ff4493697f1c70 100644 --- a/.yamato/build_windows_x64.yml +++ b/.yamato/build_and_test_windows_x64.yml @@ -1,3 +1,5 @@ +{% metadata_file .yamato/Globals.metafile %} +--- name: Build and Test Windows x64 agent: @@ -5,6 +7,9 @@ agent: image: platform-foundation/windows-vs2019-il2cpp-bokken:latest flavor: b1.xlarge +variables: + ARTIFACT_FILENAME: {{globals.artifact_base_name}}-win-x64.7z + commands: - | cd unity\unitygc @@ -13,7 +18,7 @@ commands: - build.cmd -subset clr+libs -a x64 -c release -ci - copy unity\unitygc\Release\unitygc.dll artifacts\bin\microsoft.netcore.app.runtime.win-x64\Release\runtimes\win-x64\native - powershell .yamato\scripts\download_7z.ps1 - - artifacts\7za-win-x64\7za.exe a artifacts\unity\dotnet-runtime-unity-win-x64.7z .\artifacts\bin\microsoft.netcore.app.runtime.win-x64\Release\runtimes\win-x64 + - artifacts\7za-win-x64\7za.exe a artifacts\unity\%ARTIFACT_FILENAME% .\artifacts\bin\microsoft.netcore.app.runtime.win-x64\Release\runtimes\win-x64 # build/run tests - build.cmd libs.tests -test -a x64 -c release -ci - src\tests\build.cmd x64 release ci @@ -28,4 +33,4 @@ triggers: artifacts: win64: paths: - - artifacts\unity\dotnet-runtime-unity-win-x64.7z + - artifacts\unity\%ARTIFACT_FILENAME% From 5b72d01133a9a462da5fcd4fc87a8c5c6c30dd3a Mon Sep 17 00:00:00 2001 From: Brian Taylor Date: Wed, 23 Feb 2022 20:38:56 -0500 Subject: [PATCH 2/4] Split up building, testing, and stevedore publishing yamato configurations. --- .yamato/Globals.metafile | 3 ++- .yamato/build_and_publish_to_stevedore.yml | 7 ----- ...ild_and_publish_to_stevedore_linux_x64.yml | 22 ---------------- ...build_and_publish_to_stevedore_osx_x64.yml | 22 ---------------- ...build_and_publish_to_stevedore_windows.yml | 21 --------------- ...d_and_publish_to_stevedore_windows_x64.yml | 20 -------------- ...test_linux_x64.yml => build_linux_x64.yml} | 24 +++++------------ ...and_test_osx_x64.yml => build_osx_x64.yml} | 23 +++++----------- ...and_test_windows.yml => build_windows.yml} | 21 +++++---------- ..._windows_x64.yml => build_windows_x64.yml} | 21 +++++---------- .yamato/publish_to_stevedore.yml | 7 +++++ .yamato/publish_to_stevedore_linux_x64.yml | 20 ++++++++++++++ .yamato/publish_to_stevedore_osx_x64.yml | 20 ++++++++++++++ .yamato/publish_to_stevedore_windows.yml | 19 ++++++++++++++ .yamato/publish_to_stevedore_windows_x64.yml | 19 ++++++++++++++ .yamato/test_linux_x64.yml | 26 +++++++++++++++++++ .yamato/test_osx_x64.yml | 25 ++++++++++++++++++ .yamato/test_windows.yml | 23 ++++++++++++++++ .yamato/test_windows_x64.yml | 23 ++++++++++++++++ 19 files changed, 212 insertions(+), 154 deletions(-) delete mode 100644 .yamato/build_and_publish_to_stevedore.yml delete mode 100644 .yamato/build_and_publish_to_stevedore_linux_x64.yml delete mode 100644 .yamato/build_and_publish_to_stevedore_osx_x64.yml delete mode 100644 .yamato/build_and_publish_to_stevedore_windows.yml delete mode 100644 .yamato/build_and_publish_to_stevedore_windows_x64.yml rename .yamato/{build_and_test_linux_x64.yml => build_linux_x64.yml} (65%) rename .yamato/{build_and_test_osx_x64.yml => build_osx_x64.yml} (65%) rename .yamato/{build_and_test_windows.yml => build_windows.yml} (69%) rename .yamato/{build_and_test_windows_x64.yml => build_windows_x64.yml} (68%) create mode 100644 .yamato/publish_to_stevedore.yml create mode 100644 .yamato/publish_to_stevedore_linux_x64.yml create mode 100644 .yamato/publish_to_stevedore_osx_x64.yml create mode 100644 .yamato/publish_to_stevedore_windows.yml create mode 100644 .yamato/publish_to_stevedore_windows_x64.yml create mode 100644 .yamato/test_linux_x64.yml create mode 100644 .yamato/test_osx_x64.yml create mode 100644 .yamato/test_windows.yml create mode 100644 .yamato/test_windows_x64.yml diff --git a/.yamato/Globals.metafile b/.yamato/Globals.metafile index 12fabfc732ba0a..e1d83df1c5b9de 100644 --- a/.yamato/Globals.metafile +++ b/.yamato/Globals.metafile @@ -1,2 +1,3 @@ globals: - artifact_base_name: dotnet-runtime-unity \ No newline at end of file + artifact_base_name: dotnet-runtime-unity + stevedore_publish_location: testing diff --git a/.yamato/build_and_publish_to_stevedore.yml b/.yamato/build_and_publish_to_stevedore.yml deleted file mode 100644 index 2164be676c4eb9..00000000000000 --- a/.yamato/build_and_publish_to_stevedore.yml +++ /dev/null @@ -1,7 +0,0 @@ -all: - name: Build and Publish To Stevedore - dependencies: - - .yamato/build_and_publish_to_stevedore_windows.yml - - .yamato/build_and_publish_to_stevedore_windows_x64.yml - - .yamato/build_and_publish_to_stevedore_osx_x64.yml - - .yamato/build_and_publish_to_stevedore_linux_x64.yml diff --git a/.yamato/build_and_publish_to_stevedore_linux_x64.yml b/.yamato/build_and_publish_to_stevedore_linux_x64.yml deleted file mode 100644 index 4a0c2bc256fb3b..00000000000000 --- a/.yamato/build_and_publish_to_stevedore_linux_x64.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: Build and Publish To Stevedore Linux x64 - -agent: - type: Unity::VM - image: platform-foundation/linux-ubuntu-18.04-mono-bokken:latest - flavor: b1.large - -dependencies: - - path: .yamato/build_and_test_linux_x64.yml - location: build - unzip: false - -commands: -# upload to stevedore - - curl -sSo StevedoreUpload "$STEVEDORE_UPLOAD_TOOL_LINUX_X64_URL" - - chmod +x StevedoreUpload - - ./StevedoreUpload --version-len=12 --repo=testing --version="$GIT_REVISION" build/* - -artifacts: - linux64: - paths: - - stevedore/artifactid.txt diff --git a/.yamato/build_and_publish_to_stevedore_osx_x64.yml b/.yamato/build_and_publish_to_stevedore_osx_x64.yml deleted file mode 100644 index fd112b5a2fdb8a..00000000000000 --- a/.yamato/build_and_publish_to_stevedore_osx_x64.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: Build and Publish To Stevedore OSX x64 - -agent: - type: Unity::VM::osx - image: platform-foundation/mac-bokken:latest - flavor: m1.mac - -dependencies: - - path: .yamato/build_and_test_osx_x64.yml - location: build - unzip: false - -commands: -# upload to stevedore - - curl -sSo StevedoreUpload "$STEVEDORE_UPLOAD_TOOL_MAC_X64_URL" - - chmod +x StevedoreUpload - - ./StevedoreUpload --version-len=12 --repo=testing --version="$GIT_REVISION" build/* - -artifacts: - osx64: - paths: - - stevedore/artifactid.txt diff --git a/.yamato/build_and_publish_to_stevedore_windows.yml b/.yamato/build_and_publish_to_stevedore_windows.yml deleted file mode 100644 index 859f72744f50d2..00000000000000 --- a/.yamato/build_and_publish_to_stevedore_windows.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: Build and Publish To Stevedore Windows x86 - -agent: - type: Unity::VM - image: platform-foundation/windows-vs2019-il2cpp-bokken:latest - flavor: b1.xlarge - -dependencies: - - path: .yamato/build_and_test_windows.yml - location: build - unzip: false - -commands: -# upload to stevedore - - curl -sSo StevedoreUpload.exe "%STEVEDORE_UPLOAD_TOOL_WINDOWS_X64_URL%" - - StevedoreUpload.exe --version-len=12 --repo=testing --version="%GIT_REVISION%" build\* - -artifacts: - win32: - paths: - - stevedore/artifactid.txt diff --git a/.yamato/build_and_publish_to_stevedore_windows_x64.yml b/.yamato/build_and_publish_to_stevedore_windows_x64.yml deleted file mode 100644 index eb6e17293d489c..00000000000000 --- a/.yamato/build_and_publish_to_stevedore_windows_x64.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: Build and Publish To Stevedore Windows x64 - -agent: - type: Unity::VM - image: platform-foundation/windows-vs2019-il2cpp-bokken:latest - flavor: b1.xlarge - -dependencies: - - path: .yamato/build_and_test_windows_x64.yml - unzip: false - -commands: -# upload to stevedore - - curl -sSo StevedoreUpload.exe "%STEVEDORE_UPLOAD_TOOL_WINDOWS_X64_URL%" - - StevedoreUpload.exe --version-len=12 --repo=testing --version="%GIT_REVISION%" artifacts\unity\%ARTIFACT_FILENAME% - -artifacts: - win64: - paths: - - stevedore/artifactid.txt diff --git a/.yamato/build_and_test_linux_x64.yml b/.yamato/build_linux_x64.yml similarity index 65% rename from .yamato/build_and_test_linux_x64.yml rename to .yamato/build_linux_x64.yml index 2f19e7f7802b20..493fd0086fe2a0 100644 --- a/.yamato/build_and_test_linux_x64.yml +++ b/.yamato/build_linux_x64.yml @@ -1,6 +1,6 @@ {% metadata_file .yamato/Globals.metafile %} --- -name: Build and Test Linux x64 +name: Build Linux x64 agent: type: Unity::VM @@ -23,21 +23,11 @@ commands: - ./build.sh -subset clr+libs+libs -a x64 -c release -ci -ninja - cp unity/unitygc/release/libunitygc.so artifacts/bin/microsoft.netcore.app.runtime.linux-x64/Release/runtimes/linux-x64/native - artifacts/7za-linux-x64/7za a artifacts/unity/$ARTIFACT_FILENAME ./artifacts/bin/microsoft.netcore.app.runtime.linux-x64/Release/runtimes/linux-x64 -# build/run tests - - ./build.sh -subset libs.tests -test -a x64 -c release -ci -ninja - - command: ./src/tests/build.sh x64 release ci - retries: 1 - - ./src/tests/run.sh x64 release - - ./build.sh clr.paltests - - ./artifacts/bin/coreclr/$(uname).x64.Debug/paltests/runpaltests.sh $(pwd)/artifacts/bin/coreclr/$(uname).x64.Debug/paltests -triggers: - pull_requests: - - targets: - only: - - "unity-main" - -artifacts: - linux64: +artifacts: + linux-x64-7z: + paths: + - artifacts/unity/** + linux-x64: paths: - - artifacts/unity/$ARTIFACT_FILENAME + - artifacts/bin/** diff --git a/.yamato/build_and_test_osx_x64.yml b/.yamato/build_osx_x64.yml similarity index 65% rename from .yamato/build_and_test_osx_x64.yml rename to .yamato/build_osx_x64.yml index ed6c908cd89d5f..ba7c39774ad6d1 100644 --- a/.yamato/build_and_test_osx_x64.yml +++ b/.yamato/build_osx_x64.yml @@ -1,6 +1,6 @@ {% metadata_file .yamato/Globals.metafile %} --- -name: Build and Test OSX x64 +name: Build OSX x64 agent: type: Unity::VM::osx @@ -23,20 +23,11 @@ commands: - LD_LIBRARY_PATH=/usr/local/opt/openssl/lib ./build.sh -subset clr+libs -a x64 -c release -ci -ninja - cp unity/unitygc/release/libunitygc.dylib artifacts/bin/microsoft.netcore.app.runtime.osx-x64/Release/runtimes/osx-x64/native - artifacts/7za-mac-x64/7za a artifacts/unity/$ARTIFACT_FILENAME ./artifacts/bin/microsoft.netcore.app.runtime.osx-x64/Release/runtimes/osx-x64 -# build/run tests - - LD_LIBRARY_PATH=/usr/local/opt/openssl/lib ./build.sh -subset libs.tests -test -a x64 -c release -ci -ninja - - ./src/tests/build.sh x64 release ci - - ./src/tests/run.sh x64 release - - ./build.sh clr.paltests - - ./artifacts/bin/coreclr/OSX.x64.Debug/paltests/runpaltests.sh $(pwd)/artifacts/bin/coreclr/OSX.x64.Debug/paltests -triggers: - pull_requests: - - targets: - only: - - "unity-main" - -artifacts: - osx64: +artifacts: + osx-x64-7z: + paths: + - artifacts/unity/** + osx-x64: paths: - - artifacts/unity/$ARTIFACT_FILENAME + - artifacts/bin/** diff --git a/.yamato/build_and_test_windows.yml b/.yamato/build_windows.yml similarity index 69% rename from .yamato/build_and_test_windows.yml rename to .yamato/build_windows.yml index c94653919cecac..21b59eb650a7ad 100644 --- a/.yamato/build_and_test_windows.yml +++ b/.yamato/build_windows.yml @@ -1,6 +1,6 @@ {% metadata_file .yamato/Globals.metafile %} --- -name: Build and Test Windows x86 +name: Build Windows x86 agent: type: Unity::VM @@ -19,18 +19,11 @@ commands: - copy unity\unitygc\Release\unitygc.dll artifacts\bin\microsoft.netcore.app.runtime.win-x86\Release\runtimes\win-x86\native - powershell .yamato\scripts\download_7z.ps1 - artifacts\7za-win-x64\7za.exe a artifacts\unity\%ARTIFACT_FILENAME% .\artifacts\bin\microsoft.netcore.app.runtime.win-x86\Release\runtimes\win-x86 -# build/run tests - - build.cmd libs.tests -test -a x86 -c release -ci - - src\tests\build.cmd x86 release ci - - src\tests\run.cmd x86 release -triggers: - pull_requests: - - targets: - only: - - "unity-main" - -artifacts: - win32: +artifacts: + win-x86-7z: + paths: + - artifacts\unity\** + win-x86: paths: - - artifacts\unity\%ARTIFACT_FILENAME% + - artifacts\bin\** diff --git a/.yamato/build_and_test_windows_x64.yml b/.yamato/build_windows_x64.yml similarity index 68% rename from .yamato/build_and_test_windows_x64.yml rename to .yamato/build_windows_x64.yml index ff4493697f1c70..77ac7888e3915e 100644 --- a/.yamato/build_and_test_windows_x64.yml +++ b/.yamato/build_windows_x64.yml @@ -1,6 +1,6 @@ {% metadata_file .yamato/Globals.metafile %} --- -name: Build and Test Windows x64 +name: Build Windows x64 agent: type: Unity::VM @@ -19,18 +19,11 @@ commands: - copy unity\unitygc\Release\unitygc.dll artifacts\bin\microsoft.netcore.app.runtime.win-x64\Release\runtimes\win-x64\native - powershell .yamato\scripts\download_7z.ps1 - artifacts\7za-win-x64\7za.exe a artifacts\unity\%ARTIFACT_FILENAME% .\artifacts\bin\microsoft.netcore.app.runtime.win-x64\Release\runtimes\win-x64 -# build/run tests - - build.cmd libs.tests -test -a x64 -c release -ci - - src\tests\build.cmd x64 release ci - - src\tests\run.cmd x64 release -triggers: - pull_requests: - - targets: - only: - - "unity-main" - -artifacts: - win64: +artifacts: + win-x64-7z: + paths: + - artifacts\unity\** + win-x64: paths: - - artifacts\unity\%ARTIFACT_FILENAME% + - artifacts\bin\** diff --git a/.yamato/publish_to_stevedore.yml b/.yamato/publish_to_stevedore.yml new file mode 100644 index 00000000000000..abcc0b53f9cea1 --- /dev/null +++ b/.yamato/publish_to_stevedore.yml @@ -0,0 +1,7 @@ +all: + name: Publish To Stevedore + dependencies: + - .yamato/publish_to_stevedore_windows.yml + - .yamato/publish_to_stevedore_windows_x64.yml + - .yamato/publish_to_stevedore_osx_x64.yml + - .yamato/publish_to_stevedore_linux_x64.yml diff --git a/.yamato/publish_to_stevedore_linux_x64.yml b/.yamato/publish_to_stevedore_linux_x64.yml new file mode 100644 index 00000000000000..bd5a55fab1a175 --- /dev/null +++ b/.yamato/publish_to_stevedore_linux_x64.yml @@ -0,0 +1,20 @@ +{% metadata_file .yamato/Globals.metafile %} +--- +name: Publish To Stevedore Linux x64 + +agent: + type: Unity::VM + image: platform-foundation/linux-ubuntu-18.04-mono-bokken:latest + flavor: b1.large + +dependencies: + - path: .yamato/build_linux_x64.yml + +variables: + STEVEDORE_REPO: {{globals.stevedore_publish_location}} + +commands: +# upload to stevedore + - curl -sSo StevedoreUpload "$STEVEDORE_UPLOAD_TOOL_LINUX_X64_URL" + - chmod +x StevedoreUpload + - ./StevedoreUpload --version-len=12 --repo=$STEVEDORE_REPO --version="$GIT_REVISION" artifacts/unity/* diff --git a/.yamato/publish_to_stevedore_osx_x64.yml b/.yamato/publish_to_stevedore_osx_x64.yml new file mode 100644 index 00000000000000..328a0673536c10 --- /dev/null +++ b/.yamato/publish_to_stevedore_osx_x64.yml @@ -0,0 +1,20 @@ +{% metadata_file .yamato/Globals.metafile %} +--- +name: Publish To Stevedore OSX x64 + +agent: + type: Unity::VM::osx + image: platform-foundation/mac-bokken:latest + flavor: m1.mac + +dependencies: + - path: .yamato/build_osx_x64.yml + +variables: + STEVEDORE_REPO: {{globals.stevedore_publish_location}} + +commands: +# upload to stevedore + - curl -sSo StevedoreUpload "$STEVEDORE_UPLOAD_TOOL_MAC_X64_URL" + - chmod +x StevedoreUpload + - ./StevedoreUpload --version-len=12 --repo=$STEVEDORE_REPO --version="$GIT_REVISION" artifacts/unity/* diff --git a/.yamato/publish_to_stevedore_windows.yml b/.yamato/publish_to_stevedore_windows.yml new file mode 100644 index 00000000000000..13df43148192ab --- /dev/null +++ b/.yamato/publish_to_stevedore_windows.yml @@ -0,0 +1,19 @@ +{% metadata_file .yamato/Globals.metafile %} +--- +name: Publish To Stevedore Windows x86 + +agent: + type: Unity::VM + image: platform-foundation/windows-vs2019-il2cpp-bokken:latest + flavor: b1.xlarge + +dependencies: + - path: .yamato/build_windows.yml + +variables: + STEVEDORE_REPO: {{globals.stevedore_publish_location}} + +commands: +# upload to stevedore + - curl -sSo StevedoreUpload.exe "%STEVEDORE_UPLOAD_TOOL_WINDOWS_X64_URL%" + - StevedoreUpload.exe --version-len=12 --repo=%STEVEDORE_REPO% --version="%GIT_REVISION%" artifacts\unity\* diff --git a/.yamato/publish_to_stevedore_windows_x64.yml b/.yamato/publish_to_stevedore_windows_x64.yml new file mode 100644 index 00000000000000..ebaebda21dab45 --- /dev/null +++ b/.yamato/publish_to_stevedore_windows_x64.yml @@ -0,0 +1,19 @@ +{% metadata_file .yamato/Globals.metafile %} +--- +name: Publish To Stevedore Windows x64 + +agent: + type: Unity::VM + image: platform-foundation/windows-vs2019-il2cpp-bokken:latest + flavor: b1.xlarge + +dependencies: + - path: .yamato/build_windows_x64.yml + +variables: + STEVEDORE_REPO: {{globals.stevedore_publish_location}} + +commands: +# upload to stevedore + - curl -sSo StevedoreUpload.exe "%STEVEDORE_UPLOAD_TOOL_WINDOWS_X64_URL%" + - StevedoreUpload.exe --version-len=12 --repo=%STEVEDORE_REPO% --version="%GIT_REVISION%" artifacts\unity\* diff --git a/.yamato/test_linux_x64.yml b/.yamato/test_linux_x64.yml new file mode 100644 index 00000000000000..b9eb9970a13ebe --- /dev/null +++ b/.yamato/test_linux_x64.yml @@ -0,0 +1,26 @@ +{% metadata_file .yamato/Globals.metafile %} +--- +name: Test Linux x64 + +agent: + type: Unity::VM + image: platform-foundation/linux-ubuntu-18.04-mono-bokken:0.1.7-978398 + flavor: b1.large + +dependencies: + - path: .yamato/build_linux_x64.yml + +commands: +# build/run tests + - ./build.sh -subset libs.tests -test -a x64 -c release -ci -ninja + - command: ./src/tests/build.sh x64 release ci + retries: 1 + - ./src/tests/run.sh x64 release + - ./build.sh clr.paltests + - ./artifacts/bin/coreclr/$(uname).x64.Debug/paltests/runpaltests.sh $(pwd)/artifacts/bin/coreclr/$(uname).x64.Debug/paltests + +triggers: + pull_requests: + - targets: + only: + - "unity-main" diff --git a/.yamato/test_osx_x64.yml b/.yamato/test_osx_x64.yml new file mode 100644 index 00000000000000..0f54f9b8368faf --- /dev/null +++ b/.yamato/test_osx_x64.yml @@ -0,0 +1,25 @@ +{% metadata_file .yamato/Globals.metafile %} +--- +name: Test OSX x64 + +agent: + type: Unity::VM::osx + image: platform-foundation/mac-bokken:latest + flavor: m1.mac + +dependencies: + - path: .yamato/build_osx_x64.yml + +commands: +# build/run tests + - LD_LIBRARY_PATH=/usr/local/opt/openssl/lib ./build.sh -subset libs.tests -test -a x64 -c release -ci -ninja + - ./src/tests/build.sh x64 release ci + - ./src/tests/run.sh x64 release + - ./build.sh clr.paltests + - ./artifacts/bin/coreclr/OSX.x64.Debug/paltests/runpaltests.sh $(pwd)/artifacts/bin/coreclr/OSX.x64.Debug/paltests + +triggers: + pull_requests: + - targets: + only: + - "unity-main" diff --git a/.yamato/test_windows.yml b/.yamato/test_windows.yml new file mode 100644 index 00000000000000..312c15402006f5 --- /dev/null +++ b/.yamato/test_windows.yml @@ -0,0 +1,23 @@ +{% metadata_file .yamato/Globals.metafile %} +--- +name: Test Windows x86 + +agent: + type: Unity::VM + image: platform-foundation/windows-vs2019-il2cpp-bokken:latest + flavor: b1.xlarge + +dependencies: + - path: .yamato/build_windows.yml + +commands: +# build/run tests + - build.cmd libs.tests -test -a x86 -c release -ci + - src\tests\build.cmd x86 release ci + - src\tests\run.cmd x86 release + +triggers: + pull_requests: + - targets: + only: + - "unity-main" diff --git a/.yamato/test_windows_x64.yml b/.yamato/test_windows_x64.yml new file mode 100644 index 00000000000000..ee4ad3cad7c91f --- /dev/null +++ b/.yamato/test_windows_x64.yml @@ -0,0 +1,23 @@ +{% metadata_file .yamato/Globals.metafile %} +--- +name: Test Windows x64 + +agent: + type: Unity::VM + image: platform-foundation/windows-vs2019-il2cpp-bokken:latest + flavor: b1.xlarge + +dependencies: + - path: .yamato/build_windows_x64.yml + +commands: +# build/run tests + - build.cmd libs.tests -test -a x64 -c release -ci + - src\tests\build.cmd x64 release ci + - src\tests\run.cmd x64 release + +triggers: + pull_requests: + - targets: + only: + - "unity-main" From ba8c8fbd7c9e94a4587487918d29b93b1132b4f5 Mon Sep 17 00:00:00 2001 From: Brian Taylor Date: Thu, 24 Feb 2022 10:51:32 -0500 Subject: [PATCH 3/4] Change stevedore artifact base name from 'dotnet-runtime-unity' to 'dotnet-unity' to fit within character limit on stevedore. --- .yamato/Globals.metafile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.yamato/Globals.metafile b/.yamato/Globals.metafile index e1d83df1c5b9de..3918a2789a5fbb 100644 --- a/.yamato/Globals.metafile +++ b/.yamato/Globals.metafile @@ -1,3 +1,3 @@ globals: - artifact_base_name: dotnet-runtime-unity + artifact_base_name: dotnet-unity stevedore_publish_location: testing From 41f1bd8707439da17638e9a663864714d42b2f48 Mon Sep 17 00:00:00 2001 From: Brian Taylor Date: Fri, 25 Feb 2022 11:52:44 -0500 Subject: [PATCH 4/4] Pin bokken image versions --- .yamato/build_osx_x64.yml | 2 +- .yamato/build_windows.yml | 2 +- .yamato/build_windows_x64.yml | 2 +- .yamato/test_osx_x64.yml | 2 +- .yamato/test_windows.yml | 2 +- .yamato/test_windows_x64.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.yamato/build_osx_x64.yml b/.yamato/build_osx_x64.yml index ba7c39774ad6d1..d01b77d305e3e6 100644 --- a/.yamato/build_osx_x64.yml +++ b/.yamato/build_osx_x64.yml @@ -4,7 +4,7 @@ name: Build OSX x64 agent: type: Unity::VM::osx - image: platform-foundation/mac-bokken:latest + image: platform-foundation/mac-bokken:v0.1.8-972754 flavor: m1.mac variables: diff --git a/.yamato/build_windows.yml b/.yamato/build_windows.yml index 21b59eb650a7ad..7d3470bbbc427f 100644 --- a/.yamato/build_windows.yml +++ b/.yamato/build_windows.yml @@ -4,7 +4,7 @@ name: Build Windows x86 agent: type: Unity::VM - image: platform-foundation/windows-vs2019-il2cpp-bokken:latest + image: platform-foundation/windows-vs2019-il2cpp-bokken:v1.1.6-1025111 flavor: b1.xlarge variables: diff --git a/.yamato/build_windows_x64.yml b/.yamato/build_windows_x64.yml index 77ac7888e3915e..21f8363220f456 100644 --- a/.yamato/build_windows_x64.yml +++ b/.yamato/build_windows_x64.yml @@ -4,7 +4,7 @@ name: Build Windows x64 agent: type: Unity::VM - image: platform-foundation/windows-vs2019-il2cpp-bokken:latest + image: platform-foundation/windows-vs2019-il2cpp-bokken:v1.1.6-1025111 flavor: b1.xlarge variables: diff --git a/.yamato/test_osx_x64.yml b/.yamato/test_osx_x64.yml index 0f54f9b8368faf..5c485bf07d4543 100644 --- a/.yamato/test_osx_x64.yml +++ b/.yamato/test_osx_x64.yml @@ -4,7 +4,7 @@ name: Test OSX x64 agent: type: Unity::VM::osx - image: platform-foundation/mac-bokken:latest + image: platform-foundation/mac-bokken:v0.1.8-972754 flavor: m1.mac dependencies: diff --git a/.yamato/test_windows.yml b/.yamato/test_windows.yml index 312c15402006f5..a57e7be31494ab 100644 --- a/.yamato/test_windows.yml +++ b/.yamato/test_windows.yml @@ -4,7 +4,7 @@ name: Test Windows x86 agent: type: Unity::VM - image: platform-foundation/windows-vs2019-il2cpp-bokken:latest + image: platform-foundation/windows-vs2019-il2cpp-bokken:v1.1.6-1025111 flavor: b1.xlarge dependencies: diff --git a/.yamato/test_windows_x64.yml b/.yamato/test_windows_x64.yml index ee4ad3cad7c91f..131d92feb46555 100644 --- a/.yamato/test_windows_x64.yml +++ b/.yamato/test_windows_x64.yml @@ -4,7 +4,7 @@ name: Test Windows x64 agent: type: Unity::VM - image: platform-foundation/windows-vs2019-il2cpp-bokken:latest + image: platform-foundation/windows-vs2019-il2cpp-bokken:v1.1.6-1025111 flavor: b1.xlarge dependencies: