From 9cb16642d4368eb2e1f0786ac8f533a4db411e24 Mon Sep 17 00:00:00 2001 From: Alex Thibodeau Date: Fri, 27 Jun 2025 10:41:49 -0400 Subject: [PATCH] Switch publish to stevedore to use the tar.zst file instead of the 7z Update Publish to Stevedore to use new upload executable Update token key used for prtools Adding generate_artifactid script to create the file PRTools is looking for. artifactid file is now in collectedbuilds --- .yamato/Publish To Stevedore.yml | 9 ++++++--- .yamato/Update Il2cpp-deps.yml | 2 +- .yamato/scripts/generate_artifactid.sh | 10 ++++++++++ 3 files changed, 17 insertions(+), 4 deletions(-) create mode 100755 .yamato/scripts/generate_artifactid.sh diff --git a/.yamato/Publish To Stevedore.yml b/.yamato/Publish To Stevedore.yml index c3039125e41e..1c26fe7f6ac6 100644 --- a/.yamato/Publish To Stevedore.yml +++ b/.yamato/Publish To Stevedore.yml @@ -9,11 +9,14 @@ dependencies: - .yamato/Collate Builds.yml commands: - - curl -sSo StevedoreUpload.exe "$STEVEDORE_UPLOAD_TOOL_URL" - - mono StevedoreUpload.exe --repo=unity-internal --version-len=8 --version="$GIT_REVISION" stevedore/MonoBleedingEdge.7z + - curl -sSo StevedoreUpload "$STEVEDORE_UPLOAD_TOOL_LINUX_X64_URL" + - chmod +x StevedoreUpload + - mv collectedbuilds/builds.tar.zst collectedbuilds/MonoBleedingEdge.tar.zst + - .yamato/scripts/generate_artifactid.sh collectedbuilds/MonoBleedingEdge.tar.zst + - ./StevedoreUpload --repo=unity-internal --version-len=8 --version="$GIT_REVISION" collectedbuilds/MonoBleedingEdge.tar.zst artifacts: stevedore: paths: - - stevedore/artifactid.txt + - collectedbuilds/artifactid.txt diff --git a/.yamato/Update Il2cpp-deps.yml b/.yamato/Update Il2cpp-deps.yml index 6a910506a64f..c2c93116d8d1 100644 --- a/.yamato/Update Il2cpp-deps.yml +++ b/.yamato/Update Il2cpp-deps.yml @@ -13,7 +13,7 @@ commands: git checkout main cd %UNITY_SOURCE_PRTOOLS_DIR% git config --global core.longpaths true - cmd /v /c dotnet run --project C:\build\output\prtools\PRTools\PRTools.csproj --update-mono-il2cpp-deps=%YAMATO_SOURCE_DIR%/stevedore/artifactid.txt --github-api-token=%GITHUB_TOKEN% --yamato-api-token=%YAMATO_TOKEN% --yamato-long-lived-token --il2cpp-deps-manifest-file=il2cpp-deps.stevedore --yamato-owner-email=%YAMATO_OWNER_EMAIL% + cmd /v /c dotnet run --project C:\build\output\prtools\PRTools\PRTools.csproj --update-mono-il2cpp-deps=%YAMATO_SOURCE_DIR%/collectedbuilds/artifactid.txt --github-api-token=%IL2CPP_GITHUB_TOKEN% --yamato-api-token=%YAMATO_TOKEN% --yamato-long-lived-token --il2cpp-deps-manifest-file=il2cpp-deps.stevedore --yamato-owner-email=%YAMATO_OWNER_EMAIL% if NOT %errorlevel% == 0 ( echo "PRTools failed" EXIT /B %errorlevel% diff --git a/.yamato/scripts/generate_artifactid.sh b/.yamato/scripts/generate_artifactid.sh new file mode 100755 index 000000000000..c8f3e2b55a15 --- /dev/null +++ b/.yamato/scripts/generate_artifactid.sh @@ -0,0 +1,10 @@ +#!/bin/bash +set -euxo pipefail + +revision=$(git rev-parse --short HEAD) +artifactsha=$(sha256sum $1 | cut -d " " -f1) + +mkdir -p collectedbuilds + +printf "MonoBleedingEdge/%s_%s.tar.zst\n" $revision $artifactsha > collectedbuilds/artifactid.txt +