From e94cba20efedba12ec0ba69a425ee29359e1a0a5 Mon Sep 17 00:00:00 2001 From: Brian Taylor Date: Mon, 28 Feb 2022 14:03:55 -0500 Subject: [PATCH] Make sure .7z archives have the correct directory structure --- .yamato/build_linux_x64.yml | 2 +- .yamato/build_osx_arm64.yml | 2 +- .yamato/build_osx_x64.yml | 2 +- .yamato/build_windows.yml | 2 +- .yamato/build_windows_x64.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.yamato/build_linux_x64.yml b/.yamato/build_linux_x64.yml index 493fd0086fe2a..57cd0c132d1b9 100644 --- a/.yamato/build_linux_x64.yml +++ b/.yamato/build_linux_x64.yml @@ -22,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/$ARTIFACT_FILENAME ./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/* artifacts: linux-x64-7z: diff --git a/.yamato/build_osx_arm64.yml b/.yamato/build_osx_arm64.yml index 31bed22c4d30f..ecaaa63b55884 100644 --- a/.yamato/build_osx_arm64.yml +++ b/.yamato/build_osx_arm64.yml @@ -22,7 +22,7 @@ commands: cmake --build . - LD_LIBRARY_PATH=/usr/local/opt/openssl/lib ./build.sh -subset clr+libs -a arm64 -c release -cross -ci -ninja /p:CrossBuild=true - cp unity/unitygc/release/libunitygc.dylib artifacts/bin/microsoft.netcore.app.runtime.osx-arm64/Release/runtimes/osx-arm64/native - - artifacts/7za-mac-x64/7za a artifacts/unity/$ARTIFACT_FILENAME ./artifacts/bin/microsoft.netcore.app.runtime.osx-arm64/Release/runtimes/osx-arm64 + - artifacts/7za-mac-x64/7za a artifacts/unity/$ARTIFACT_FILENAME ./artifacts/bin/microsoft.netcore.app.runtime.osx-arm64/Release/runtimes/osx-arm64/* artifacts: osx-arm64-7z: diff --git a/.yamato/build_osx_x64.yml b/.yamato/build_osx_x64.yml index d01b77d305e3e..a53c437118ab6 100644 --- a/.yamato/build_osx_x64.yml +++ b/.yamato/build_osx_x64.yml @@ -22,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/$ARTIFACT_FILENAME ./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/* artifacts: osx-x64-7z: diff --git a/.yamato/build_windows.yml b/.yamato/build_windows.yml index 7d3470bbbc427..4cd3fba3b0007 100644 --- a/.yamato/build_windows.yml +++ b/.yamato/build_windows.yml @@ -18,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\%ARTIFACT_FILENAME% .\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\* artifacts: win-x86-7z: diff --git a/.yamato/build_windows_x64.yml b/.yamato/build_windows_x64.yml index 21f8363220f45..d3b056b7833a1 100644 --- a/.yamato/build_windows_x64.yml +++ b/.yamato/build_windows_x64.yml @@ -18,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\%ARTIFACT_FILENAME% .\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\* artifacts: win-x64-7z: