Skip to content
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

build: update unity version to 2021.3.36f1 #9

Merged
merged 1 commit into from
Mar 8, 2024
Merged

build: update unity version to 2021.3.36f1 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 6 additions & 16 deletions .github/workflows/build-Linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ on:
env:
platform: "Linux"

unityVersion: "2021.3.21f1"
unityVersionHash: "1b156197d683"
unityVersion: "2021.3.36f1"
unityVersionHash: "7a0645017be0"
blenderMajorVersion: "3.4"
blenderVersion: "3.4.1"

Expand All @@ -75,7 +75,6 @@ jobs:
timeout-minutes: 90

steps:

#############################
# Install Unity #
#############################
Expand Down Expand Up @@ -109,7 +108,6 @@ jobs:
tar -xvf "${{ runner.temp }}/UnityInstall/UnitySetup-Linux-IL2CPP-Support.tar.xz" -C "${{ runner.temp }}/Unity" &&
rm -rf "${{ runner.temp }}/UnityInstall"


#############################
# Checkout #
#############################
Expand Down Expand Up @@ -138,7 +136,6 @@ jobs:
repository: ${{ github.repository }}
path: bleedingedge


#############################
# Cache #
#############################
Expand All @@ -149,7 +146,6 @@ jobs:
path: Library
key: ${{ env.platform }}-YARG_Library


#############################
# Add Nightly definition #
#############################
Expand All @@ -167,7 +163,7 @@ jobs:
- name: "[Pre-install] Get Blender (${{ env.blenderVersion }}) from cache"
id: blender
uses: actions/cache@v3
with:
with:
path: ${{ runner.temp }}/BlenderInstall
key: Linux_Blender-${{ env.blenderVersion }}
restore-keys: Linux_Blender-
Expand All @@ -183,20 +179,18 @@ jobs:
sudo mv /opt/blender*/ /opt/blender &&
sudo ln -sf /opt/blender/blender /usr/bin/blender


#############################
# Restore Packages #
#############################

- name: "[Pre-install] Install dotnet 8.x"
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
dotnet-version: "8.0.x"

- name: "[Pre-install] Restoring NuGet Packages"
run: dotnet tool install --global NuGetForUnity.Cli && nugetforunity restore


#############################
# Replace icon #
#############################
Expand All @@ -209,7 +203,6 @@ jobs:
name: "[Pre-build] Replace icon with Nightly"
run: "cp -f bleedingedge/static/Icon_Nightly.png Assets/Art/UI/Icon_Stable.png"


#############################
# Build YARG.Core #
#############################
Expand All @@ -219,7 +212,6 @@ jobs:
mkdir Assets/Plugins/YARG.Core &&
dotnet build YARG.Core/YARG.Core/YARG.Core.csproj /property:GenerateFullPaths=true /consoleloggerparameters:NoSummary --output Assets/Plugins/YARG.Core


#############################
# Build #
#############################
Expand All @@ -235,14 +227,12 @@ jobs:
continue-on-error: true
run: ${{ runner.temp }}/Unity/Editor/Unity -quit -batchmode -nographics -returnlicense -projectPath ${{ github.workspace }} -username ${{ secrets.LINUX_UNITY_EMAIL || secrets.UNITY_EMAIL }} -password ${{ secrets.LINUX_UNITY_PASSWORD || secrets.UNITY_PASSWORD }} -logfile -


#############################
# Compress #
#############################
- name: "[Post-build] Compress to a .zip"
run: mkdir Release && (cd build && zip -r ../Release/YARG_${{ env.versionName }}-Linux-x64.zip .)


#############################
# Upload #
#############################
Expand All @@ -253,5 +243,5 @@ jobs:
name: YARG (${{ env.versionName }}) - ${{ env.platform }}
path: Release/*

outputs:
artifactId: ${{ steps.artifacts.outputs.artifact-id }}
outputs:
artifactId: ${{ steps.artifacts.outputs.artifact-id }}
23 changes: 7 additions & 16 deletions .github/workflows/build-Mac.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ on:
env:
platform: "MacOS"

unityVersion: "2021.3.21f1"
unityVersionHash: "1b156197d683"
unityVersion: "2021.3.36f1"
unityVersionHash: "7a0645017be0"
blenderMajorVersion: "3.4"
blenderVersion: "3.4.1"

Expand All @@ -75,7 +75,6 @@ jobs:
timeout-minutes: 90

steps:

#############################
# Checkout #
#############################
Expand Down Expand Up @@ -104,7 +103,6 @@ jobs:
repository: ${{ github.repository }}
path: bleedingedge


#############################
# Cache #
#############################
Expand All @@ -115,7 +113,6 @@ jobs:
path: Library
key: ${{ env.platform }}-YARG_Library


#############################
# Add Nightly definition #
#############################
Expand All @@ -133,7 +130,7 @@ jobs:
- name: "[Pre-install] Get Blender (${{ env.blenderVersion }}) from cache"
id: blender
uses: actions/cache@v3
with:
with:
path: ${{ runner.temp }}/BlenderInstall
key: Mac_Blender-${{ env.blenderVersion }}
restore-keys: Mac_Blender-
Expand All @@ -148,7 +145,6 @@ jobs:
hdiutil attach ${{ runner.temp }}/BlenderInstall/blender.dmg &&
cp -R /Volumes/Blender/Blender.app /Applications &&
hdiutil unmount /Volumes/Blender


#############################
# Restore Packages #
Expand All @@ -157,12 +153,11 @@ jobs:
- name: "[Pre-install] Install dotnet 8.x"
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
dotnet-version: "8.0.x"

- name: "[Pre-install] Restoring NuGet Packages"
run: dotnet tool install --global NuGetForUnity.Cli && nugetforunity restore


#############################
# Replace icon #
#############################
Expand All @@ -175,7 +170,6 @@ jobs:
name: "[Pre-build] Replace icon with Nightly"
run: "cp -f bleedingedge/static/Icon_Nightly.png Assets/Art/UI/Icon_Stable.png"


#############################
# Build YARG.Core #
#############################
Expand All @@ -185,7 +179,6 @@ jobs:
mkdir Assets/Plugins/YARG.Core &&
dotnet build YARG.Core/YARG.Core/YARG.Core.csproj /property:GenerateFullPaths=true /consoleloggerparameters:NoSummary --output Assets/Plugins/YARG.Core


#############################
# Build #
#############################
Expand All @@ -194,7 +187,7 @@ jobs:
run: |
mkdir ${{ runner.temp }}/UnityInstall &&
curl -L -o "${{ runner.temp }}/UnityInstall/UnitySetup-Editor.pkg" https://download.unity3d.com/download_unity/${{ env.unityVersionHash }}/MacEditorInstaller/Unity-${{ env.unityVersion }}.pkg &&
curl -L -o "${{ runner.temp }}/UnityInstall/UnitySetup-Mac-IL2CPP-Support.pkg" https://download.unity3d.com/download_unity/${{ env.unityVersionHash }}/MacEditorTargetInstaller/UnitySetup-Mac-IL2CPP-Support-for-Editor-${{ env.unityVersion }}.pkg
curl -L -o "${{ runner.temp }}/UnityInstall/UnitySetup-Mac-IL2CPP-Support.pkg" https://download.unity3d.com/download_unity/${{ env.unityVersionHash }}/MacEditorTargetInstaller/UnitySetup-Mac-IL2CPP-Support-for-Editor-${{ env.unityVersion }}.pkg

- name: "[Install] Install Unity Editor + Mac IL2CPP builder"
run: |
Expand All @@ -210,14 +203,12 @@ jobs:
continue-on-error: true
run: /Applications/Unity/Unity.app/Contents/MacOS/Unity -quit -batchmode -nographics -returnlicense -projectPath ${{ github.workspace }} -username ${{ secrets.MAC_UNITY_EMAIL || secrets.UNITY_EMAIL }} -password ${{ secrets.MAC_UNITY_PASSWORD || secrets.UNITY_PASSWORD }} -logfile -


#############################
# Compress #
#############################

- name: "[Post-build] Compress to a .zip"
run: ditto -c -k --keepParent build/YARG.app Release/YARG_${{ env.versionName }}-MacOS-Universal.zip


#############################
# Upload #
Expand All @@ -230,5 +221,5 @@ jobs:
name: YARG (${{ env.versionName }}) - ${{ env.platform }}
path: Release/*

outputs:
artifactId: ${{ steps.artifacts.outputs.artifact-id }}
outputs:
artifactId: ${{ steps.artifacts.outputs.artifact-id }}
24 changes: 7 additions & 17 deletions .github/workflows/build-Windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ on:
env:
platform: "Windows"

unityVersion: "2021.3.21f1"
unityVersionHash: "1b156197d683"
unityVersion: "2021.3.36f1"
unityVersionHash: "7a0645017be0"
blenderMajorVersion: "3.5"
blenderVersion: "3.5.1"

Expand All @@ -75,15 +75,14 @@ jobs:
timeout-minutes: 90

steps:

#############################
# Install Unity #
#############################

- name: "[Install] Get Unity Editor + Windows IL2CPP builder (${{ env.unityVersion }}) pre-installed from cache"
id: unity-install
uses: actions/[email protected]
with:
with:
path: ${{ runner.temp }}/Unity
key: Windows_Unity-${{ env.unityVersion }}

Expand All @@ -103,7 +102,6 @@ jobs:
Start-Process "${{ runner.temp }}\UnityInstall\UnitySetup-Windows-IL2CPP-Support-for-Editor-${{ env.unityVersion }}.exe" -ArgumentList $UNITY_INSTALLARGUMENTS -wait -nonewwindow;
Remove-Item -Recurse -Force -Path ${{ runner.temp }}\UnityInstall\*;


#############################
# Checkout #
#############################
Expand Down Expand Up @@ -132,7 +130,6 @@ jobs:
repository: ${{ github.repository }}
path: bleedingedge


#############################
# Cache #
#############################
Expand All @@ -143,7 +140,6 @@ jobs:
path: Library
key: ${{ env.platform }}-YARG_Library


#############################
# Add Nightly definition #
#############################
Expand All @@ -161,7 +157,7 @@ jobs:
- name: "[Pre-install] Get Blender (${{ env.blenderVersion }}) from cache"
id: blender
uses: actions/cache@v3
with:
with:
path: ${{ runner.temp }}/BlenderInstall
key: Windows_Blender-${{ env.blenderVersion }}
restore-keys: Windows_Blender-
Expand All @@ -177,20 +173,18 @@ jobs:
$BLENDERARGS = "/I $BLENDERMSI ALLUSERS=1 /qn /norestart";
Start-Process "msiexec.exe" -ArgumentList $BLENDERARGS -wait -nonewwindow


#############################
# Restore Packages #
#############################

- name: "[Pre-install] Install dotnet 8.x"
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
dotnet-version: "8.0.x"

- name: "[Pre-install] Restoring NuGet Packages"
run: dotnet tool install --global NuGetForUnity.Cli && nugetforunity restore


#############################
# Build YARG.Core #
#############################
Expand All @@ -200,7 +194,6 @@ jobs:
mkdir Assets/Plugins/YARG.Core;
dotnet build YARG.Core/YARG.Core/YARG.Core.csproj /property:GenerateFullPaths=true /consoleloggerparameters:NoSummary --output Assets/Plugins/YARG.Core;


#############################
# Replace icon #
#############################
Expand All @@ -215,7 +208,6 @@ jobs:
shell: bash
run: "cp -f bleedingedge/static/Icon_Nightly.png Assets/Art/UI/Icon_Stable.png"


#############################
# Build #
#############################
Expand All @@ -230,7 +222,6 @@ jobs:
continue-on-error: true
run: ${{ runner.temp }}/Unity/Editor/Unity.exe -quit -batchmode -nographics -returnlicense -projectPath ${{ github.workspace }} -username ${{ secrets.WINDOWS_UNITY_EMAIL || secrets.UNITY_EMAIL }} -password ${{ secrets.WINDOWS_UNITY_PASSWORD || secrets.UNITY_PASSWORD }} -logfile | Out-Host;


#############################
# Compress #
#############################
Expand All @@ -240,7 +231,6 @@ jobs:
mkdir Release;
Compress-Archive -Path ${{ github.workspace }}/build/* -DestinationPath ${{ github.workspace }}/Release/YARG_${{ env.versionName }}-Windows-x64.zip;


#############################
# Upload #
#############################
Expand All @@ -251,5 +241,5 @@ jobs:
name: YARG (${{ env.versionName }}) - ${{ env.platform }}
path: Release/*

outputs:
artifactId: ${{ steps.artifacts.outputs.artifact-id }}
outputs:
artifactId: ${{ steps.artifacts.outputs.artifact-id }}
14 changes: 8 additions & 6 deletions .github/workflows/cache-unity-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
name: 📦 Cache Unity 2021.3.21f1 for Windows
name: 📦 Cache Unity for Windows

on:
workflow_dispatch:

env:
unityVersion: "2021.3.21f1"
unityVersionHash: "1b156197d683"
unityVersion: "2021.3.36f1"
unityVersionHash: "7a0645017be0"

run-name: 📦 Cache Unity ${{ env.unityVersion }} for Windows

jobs:
cacheUnity:
name: Cache Unity 2021.3.21f1 for Windows
name: Cache Unity ${{ env.unityVersion }} for Windows
runs-on: windows-2019
timeout-minutes: 90

steps:
- name: "Get Unity Editor + Windows IL2CPP builder (${{ env.unityVersion }}) pre-installed from cache"
id: unity-install
uses: actions/[email protected]
with:
with:
path: ${{ runner.temp }}/Unity
key: Windows_Unity-${{ env.unityVersion }}

Expand All @@ -35,4 +37,4 @@ jobs:
$UNITY_INSTALLARGUMENTS = "/S /D=${{ runner.temp }}\\Unity";
Start-Process "${{ runner.temp }}\UnityInstall\UnitySetup64-${{ env.unityVersion }}.exe" -ArgumentList $UNITY_INSTALLARGUMENTS -wait -nonewwindow;
Start-Process "${{ runner.temp }}\UnityInstall\UnitySetup-Windows-IL2CPP-Support-for-Editor-${{ env.unityVersion }}.exe" -ArgumentList $UNITY_INSTALLARGUMENTS -wait -nonewwindow;
Remove-Item -Recurse -Force -Path ${{ runner.temp }}\UnityInstall\*;
Remove-Item -Recurse -Force -Path ${{ runner.temp }}\UnityInstall\*;
Loading
Loading