Skip to content

Unity Build Cleanup #128

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 4 commits into from
Mar 17, 2023
Merged

Unity Build Cleanup #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f7ece74
Initial commit for build work
UnityAlex Mar 15, 2023
6b95dfb
Move 7zip download & extraction into build process
UnityAlex Mar 16, 2023
93a3ceb
need to pass parameters correctly from yamato scripts
UnityAlex Mar 16, 2023
d2935a5
Running tests through CITools instead of separate scripts
UnityAlex Mar 16, 2023
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/build_linux_x64_debug.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ variables:
ARTIFACT_FILENAME: {{globals.artifact_base_name}}-linux-x64.7z

commands:
- ./.yamato/scripts/build_linux.sh Debug
- ./.yamato/scripts/build_yamato.sh --config=Debug

artifacts:
7z-archives:
Expand Down
2 changes: 1 addition & 1 deletion .yamato/build_linux_x64_release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ variables:
ARTIFACT_FILENAME: {{globals.artifact_base_name}}-linux-x64.7z

commands:
- ./.yamato/scripts/build_linux.sh Release
- ./.yamato/scripts/build_yamato.sh --config=Release

artifacts:
7z-archives:
Expand Down
2 changes: 1 addition & 1 deletion .yamato/build_osx_arm64_debug.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ variables:
ARTIFACT_FILENAME: {{globals.artifact_base_name}}-osx-arm64.7z

commands:
- ./.yamato/scripts/build_osx.sh arm64 Debug
- ./.yamato/scripts/build_yamato.sh --arch=arm64 --config=Debug

artifacts:
7z-archives:
Expand Down
2 changes: 1 addition & 1 deletion .yamato/build_osx_arm64_release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ variables:
ARTIFACT_FILENAME: {{globals.artifact_base_name}}-osx-arm64.7z

commands:
- ./.yamato/scripts/build_osx.sh arm64 Release
- ./.yamato/scripts/build_yamato.sh --arch=arm64 --config=Release

artifacts:
7z-archives:
Expand Down
2 changes: 1 addition & 1 deletion .yamato/build_osx_x64_debug.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ variables:
ARTIFACT_FILENAME: {{globals.artifact_base_name}}-osx-x64.7z

commands:
- ./.yamato/scripts/build_osx.sh x64 Debug
- ./.yamato/scripts/build_yamato.sh --arch=x64 --config=Debug

artifacts:
7z-archives:
Expand Down
2 changes: 1 addition & 1 deletion .yamato/build_osx_x64_release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ variables:
ARTIFACT_FILENAME: {{globals.artifact_base_name}}-osx-x64.7z

commands:
- ./.yamato/scripts/build_osx.sh x64 Release
- ./.yamato/scripts/build_yamato.sh --arch=x64 --config=Release

artifacts:
7z-archives:
Expand Down
7 changes: 2 additions & 5 deletions .yamato/build_windows_x64_debug.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,14 @@ name: Build Windows x64 Debug

agent:
type: Unity::VM
image: burst/burst-base:1.0.8-1195360
image: platform-foundation/coreclr-windows:v0.0.1-1276296
flavor: b1.xlarge

variables:
ARTIFACT_FILENAME: {{globals.artifact_base_name}}-win-x64.7z

commands:
- .yamato/scripts/build_windows.cmd x64 Debug
- powershell .yamato\scripts\download_7z.ps1
- copy LICENSE.md artifacts\bin\microsoft.netcore.app.runtime.win-x64\Debug\runtimes\win-x64
- artifacts\7za-win-x64\7za.exe a artifacts\unity\%ARTIFACT_FILENAME% .\artifacts\bin\microsoft.netcore.app.runtime.win-x64\Debug\runtimes\win-x64\*
- .yamato/scripts/build_yamato.cmd --arch=x64 --config=Debug

artifacts:
7z-archives:
Expand Down
7 changes: 2 additions & 5 deletions .yamato/build_windows_x64_release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,14 @@ name: Build Windows x64 Release

agent:
type: Unity::VM
image: burst/burst-base:1.0.8-1195360
image: platform-foundation/coreclr-windows:v0.0.1-1276296
flavor: b1.xlarge

variables:
ARTIFACT_FILENAME: {{globals.artifact_base_name}}-win-x64.7z

commands:
- .yamato/scripts/build_windows.cmd x64 Release
- powershell .yamato\scripts\download_7z.ps1
- copy LICENSE.md 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\*
- .yamato/scripts/build_yamato.cmd --arch=x64 --config=Release

artifacts:
7z-archives:
Expand Down
7 changes: 2 additions & 5 deletions .yamato/build_windows_x86_debug.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,14 @@ name: Build Windows x86 Debug

agent:
type: Unity::VM
image: burst/burst-base:1.0.8-1195360
image: platform-foundation/coreclr-windows:v0.0.1-1276296
flavor: b1.xlarge

variables:
ARTIFACT_FILENAME: {{globals.artifact_base_name}}-win-x86.7z

commands:
- .yamato/scripts/build_windows.cmd x86 Debug
- powershell .yamato\scripts\download_7z.ps1
- copy LICENSE.md artifacts\bin\microsoft.netcore.app.runtime.win-x86\Debug\runtimes\win-x86
- artifacts\7za-win-x64\7za.exe a artifacts\unity\%ARTIFACT_FILENAME% .\artifacts\bin\microsoft.netcore.app.runtime.win-x86\Debug\runtimes\win-x86\*
- .yamato/scripts/build_yamato.cmd --arch=x86 --config=Debug

artifacts:
7z-archives:
Expand Down
7 changes: 2 additions & 5 deletions .yamato/build_windows_x86_release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,14 @@ name: Build Windows x86 Release

agent:
type: Unity::VM
image: burst/burst-base:1.0.8-1195360
image: platform-foundation/coreclr-windows:v0.0.1-1276296
flavor: b1.xlarge

variables:
ARTIFACT_FILENAME: {{globals.artifact_base_name}}-win-x86.7z

commands:
- .yamato/scripts/build_windows.cmd x86 Release
- powershell .yamato\scripts\download_7z.ps1
- copy LICENSE.md 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\*
- .yamato/scripts/build_yamato.cmd --arch=x86 --config=Release

artifacts:
7z-archives:
Expand Down
70 changes: 0 additions & 70 deletions .yamato/scripts/build_linux.sh
View file
Open in desktop

This file was deleted.

95 changes: 0 additions & 95 deletions .yamato/scripts/build_osx.sh
View file
Open in desktop

This file was deleted.

79 changes: 0 additions & 79 deletions .yamato/scripts/build_windows.cmd
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions .yamato/scripts/build_yamato.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@echo off

%~dp0../../dotnet.cmd run --project %~dp0../../unity/CITools/BuildDriver/BuildDriver.csproj -- %*
4 changes: 4 additions & 0 deletions .yamato/scripts/build_yamato.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh

BASEDIR=$(dirname $0)
$BASEDIR/../../dotnet.sh run --project $BASEDIR/../../unity/CITools/BuildDriver/BuildDriver.csproj -- "$@"
Loading