From 2941fe59809781d6d0e7a6fc0f523516478a8497 Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Wed, 30 Nov 2022 23:13:19 -0500 Subject: [PATCH 1/8] test ubuntu-22.04 --- .github/workflows/validate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 4a26599..a0cc122 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -20,7 +20,7 @@ jobs: strategy: matrix: include: - - os: ubuntu-latest + - os: ubuntu-22.04 build-targets: 'StandaloneLinux64 Android iOS' - os: windows-latest build-targets: 'StandaloneWindows64 Android iOS' From 9ce8ed8f843247f5ba1ad9ba39cdc9532a28bf27 Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Wed, 30 Nov 2022 23:39:22 -0500 Subject: [PATCH 2/8] added libssl1.1 to linux hub pre-install step --- src/unity-install.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/unity-install.ps1 b/src/unity-install.ps1 index c68441a..b101e86 100644 --- a/src/unity-install.ps1 +++ b/src/unity-install.ps1 @@ -118,7 +118,7 @@ if ( -not (Test-Path -Path "$hubPath") ) { elseif ($global:PSVersionTable.OS.Contains("Linux")) { mkdir -pv "$HOME/Unity Hub" "$HOME/.config/Unity Hub" "$editorRootPath" sudo apt-get update - sudo apt-get install -y libgconf-2-4 libglu1 libasound2 libgtk2.0-0 libgtk-3-0 libnss3 zenity xvfb + sudo apt-get install -y libgconf-2-4 libglu1 libasound2 libgtk2.0-0 libgtk-3-0 libnss3 zenity xvfb libssl1.1 #https://www.linuxdeveloper.space/install-unity-linux/ $wc.DownloadFile("$baseUrl/UnityHub.AppImage", "$hubPath") From 49c54868b48e5de2dbd8caf6763863a3e75028fa Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Wed, 30 Nov 2022 23:44:30 -0500 Subject: [PATCH 3/8] add libfuse2 to unity hub linux pre-install step --- src/unity-install.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/unity-install.ps1 b/src/unity-install.ps1 index b101e86..3fc5aad 100644 --- a/src/unity-install.ps1 +++ b/src/unity-install.ps1 @@ -118,7 +118,7 @@ if ( -not (Test-Path -Path "$hubPath") ) { elseif ($global:PSVersionTable.OS.Contains("Linux")) { mkdir -pv "$HOME/Unity Hub" "$HOME/.config/Unity Hub" "$editorRootPath" sudo apt-get update - sudo apt-get install -y libgconf-2-4 libglu1 libasound2 libgtk2.0-0 libgtk-3-0 libnss3 zenity xvfb libssl1.1 + sudo apt-get install -y libgconf-2-4 libglu1 libasound2 libgtk2.0-0 libgtk-3-0 libnss3 zenity xvfb libssl1.1 libfuse2 #https://www.linuxdeveloper.space/install-unity-linux/ $wc.DownloadFile("$baseUrl/UnityHub.AppImage", "$hubPath") From 65a33e6eb6f454d4ac6a2fa706552e8d2346f826 Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Thu, 1 Dec 2022 14:52:05 -0500 Subject: [PATCH 4/8] run build script --- dist/unity-install.ps1 | 2 +- src/unity-install.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/unity-install.ps1 b/dist/unity-install.ps1 index c68441a..b101e86 100644 --- a/dist/unity-install.ps1 +++ b/dist/unity-install.ps1 @@ -118,7 +118,7 @@ if ( -not (Test-Path -Path "$hubPath") ) { elseif ($global:PSVersionTable.OS.Contains("Linux")) { mkdir -pv "$HOME/Unity Hub" "$HOME/.config/Unity Hub" "$editorRootPath" sudo apt-get update - sudo apt-get install -y libgconf-2-4 libglu1 libasound2 libgtk2.0-0 libgtk-3-0 libnss3 zenity xvfb + sudo apt-get install -y libgconf-2-4 libglu1 libasound2 libgtk2.0-0 libgtk-3-0 libnss3 zenity xvfb libssl1.1 #https://www.linuxdeveloper.space/install-unity-linux/ $wc.DownloadFile("$baseUrl/UnityHub.AppImage", "$hubPath") diff --git a/src/unity-install.ps1 b/src/unity-install.ps1 index 3fc5aad..b101e86 100644 --- a/src/unity-install.ps1 +++ b/src/unity-install.ps1 @@ -118,7 +118,7 @@ if ( -not (Test-Path -Path "$hubPath") ) { elseif ($global:PSVersionTable.OS.Contains("Linux")) { mkdir -pv "$HOME/Unity Hub" "$HOME/.config/Unity Hub" "$editorRootPath" sudo apt-get update - sudo apt-get install -y libgconf-2-4 libglu1 libasound2 libgtk2.0-0 libgtk-3-0 libnss3 zenity xvfb libssl1.1 libfuse2 + sudo apt-get install -y libgconf-2-4 libglu1 libasound2 libgtk2.0-0 libgtk-3-0 libnss3 zenity xvfb libssl1.1 #https://www.linuxdeveloper.space/install-unity-linux/ $wc.DownloadFile("$baseUrl/UnityHub.AppImage", "$hubPath") From 41e4210451f76c5a54b8a0f92b94758b54be9d7b Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Thu, 1 Dec 2022 14:53:53 -0500 Subject: [PATCH 5/8] try with libfuse2 --- dist/unity-install.ps1 | 2 +- src/unity-install.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/unity-install.ps1 b/dist/unity-install.ps1 index b101e86..3fc5aad 100644 --- a/dist/unity-install.ps1 +++ b/dist/unity-install.ps1 @@ -118,7 +118,7 @@ if ( -not (Test-Path -Path "$hubPath") ) { elseif ($global:PSVersionTable.OS.Contains("Linux")) { mkdir -pv "$HOME/Unity Hub" "$HOME/.config/Unity Hub" "$editorRootPath" sudo apt-get update - sudo apt-get install -y libgconf-2-4 libglu1 libasound2 libgtk2.0-0 libgtk-3-0 libnss3 zenity xvfb libssl1.1 + sudo apt-get install -y libgconf-2-4 libglu1 libasound2 libgtk2.0-0 libgtk-3-0 libnss3 zenity xvfb libssl1.1 libfuse2 #https://www.linuxdeveloper.space/install-unity-linux/ $wc.DownloadFile("$baseUrl/UnityHub.AppImage", "$hubPath") diff --git a/src/unity-install.ps1 b/src/unity-install.ps1 index b101e86..3fc5aad 100644 --- a/src/unity-install.ps1 +++ b/src/unity-install.ps1 @@ -118,7 +118,7 @@ if ( -not (Test-Path -Path "$hubPath") ) { elseif ($global:PSVersionTable.OS.Contains("Linux")) { mkdir -pv "$HOME/Unity Hub" "$HOME/.config/Unity Hub" "$editorRootPath" sudo apt-get update - sudo apt-get install -y libgconf-2-4 libglu1 libasound2 libgtk2.0-0 libgtk-3-0 libnss3 zenity xvfb libssl1.1 + sudo apt-get install -y libgconf-2-4 libglu1 libasound2 libgtk2.0-0 libgtk-3-0 libnss3 zenity xvfb libssl1.1 libfuse2 #https://www.linuxdeveloper.space/install-unity-linux/ $wc.DownloadFile("$baseUrl/UnityHub.AppImage", "$hubPath") From 2b140a0489bb065452b9a4183ad16c7d002389aa Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Thu, 1 Dec 2022 15:12:24 -0500 Subject: [PATCH 6/8] disable gpu --- dist/unity-install.ps1 | 2 +- src/unity-install.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/unity-install.ps1 b/dist/unity-install.ps1 index 3fc5aad..8f2fffd 100644 --- a/dist/unity-install.ps1 +++ b/dist/unity-install.ps1 @@ -70,7 +70,7 @@ elseif ( $global:PSVersionTable.OS.Contains("Linux") ) { # xvfb-run --auto-servernum "$HOME/Unity Hub/UnityHub.AppImage" --headless help function Invoke-UnityHub { $argsList = $args.Split(" ") - xvfb-run --auto-servernum "$hubPath" --headless $argsList + xvfb-run --auto-servernum "$hubPath" --disable-gpu-sandbox --headless $argsList } } diff --git a/src/unity-install.ps1 b/src/unity-install.ps1 index 3fc5aad..8f2fffd 100644 --- a/src/unity-install.ps1 +++ b/src/unity-install.ps1 @@ -70,7 +70,7 @@ elseif ( $global:PSVersionTable.OS.Contains("Linux") ) { # xvfb-run --auto-servernum "$HOME/Unity Hub/UnityHub.AppImage" --headless help function Invoke-UnityHub { $argsList = $args.Split(" ") - xvfb-run --auto-servernum "$hubPath" --headless $argsList + xvfb-run --auto-servernum "$hubPath" --disable-gpu-sandbox --headless $argsList } } From 36426d2dc2c3bd5846e0786c7a4fc237fbb69486 Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Thu, 1 Dec 2022 23:17:50 -0500 Subject: [PATCH 7/8] Update .github/workflows/validate.yml --- .github/workflows/validate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index a0cc122..cce5281 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -20,7 +20,7 @@ jobs: strategy: matrix: include: - - os: ubuntu-22.04 + - os: ubuntu-20.04 build-targets: 'StandaloneLinux64 Android iOS' - os: windows-latest build-targets: 'StandaloneWindows64 Android iOS' From 645d035f20657ac316df96431f13c7d52a48912e Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Thu, 1 Dec 2022 23:36:39 -0500 Subject: [PATCH 8/8] remove lumin and webgl from default platform module installs bump version revert validation back to using latest --- .github/workflows/validate.yml | 2 +- dist/unity-install.ps1 | 6 +++--- package.json | 2 +- src/unity-install.ps1 | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index cce5281..4a26599 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -20,7 +20,7 @@ jobs: strategy: matrix: include: - - os: ubuntu-20.04 + - os: ubuntu-latest build-targets: 'StandaloneLinux64 Android iOS' - os: windows-latest build-targets: 'StandaloneWindows64 Android iOS' diff --git a/dist/unity-install.ps1 b/dist/unity-install.ps1 index 8f2fffd..b4ba8ee 100644 --- a/dist/unity-install.ps1 +++ b/dist/unity-install.ps1 @@ -29,7 +29,7 @@ if ( (-not $global:PSVersionTable.Platform) -or ($global:PSVersionTable.Platform $editorFileEx = "\Editor\Unity.exe" if ([string]::IsNullOrEmpty($modulesList)) { - $modules = @('windows-il2cpp', 'universal-windows-platform', 'lumin', 'webgl', 'android', 'ios') + $modules = @('windows-il2cpp', 'universal-windows-platform', 'android', 'ios') } #"Unity Hub.exe" -- --headless help @@ -46,7 +46,7 @@ elseif ( $global:PSVersionTable.OS.Contains("Darwin") ) { $editorFileEx = "/Unity.app/Contents/MacOS/Unity" if ([string]::IsNullOrEmpty($modulesList)) { - $modules = @('mac-il2cpp', 'ios', 'lumin', 'webgl', 'android') + $modules = @('mac-il2cpp', 'ios', 'android') } # /Applications/Unity\ Hub.app/Contents/MacOS/Unity\ Hub -- --headless help @@ -63,7 +63,7 @@ elseif ( $global:PSVersionTable.OS.Contains("Linux") ) { $editorFileEx = "/Editor/Unity" if ([string]::IsNullOrEmpty($modulesList)) { - $modules = @('linux-il2cpp', 'webgl', 'android', 'ios') + $modules = @('linux-il2cpp', 'android', 'ios') } # /UnityHub.AppImage --headless help diff --git a/package.json b/package.json index c47e844..a346b4b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "unity-setup", - "version": "5.0.0", + "version": "6.0.0", "description": "An atomic GitHub action to download and install the Unity Editor for runners.", "main": "src/index.js", "scripts": { diff --git a/src/unity-install.ps1 b/src/unity-install.ps1 index 8f2fffd..b4ba8ee 100644 --- a/src/unity-install.ps1 +++ b/src/unity-install.ps1 @@ -29,7 +29,7 @@ if ( (-not $global:PSVersionTable.Platform) -or ($global:PSVersionTable.Platform $editorFileEx = "\Editor\Unity.exe" if ([string]::IsNullOrEmpty($modulesList)) { - $modules = @('windows-il2cpp', 'universal-windows-platform', 'lumin', 'webgl', 'android', 'ios') + $modules = @('windows-il2cpp', 'universal-windows-platform', 'android', 'ios') } #"Unity Hub.exe" -- --headless help @@ -46,7 +46,7 @@ elseif ( $global:PSVersionTable.OS.Contains("Darwin") ) { $editorFileEx = "/Unity.app/Contents/MacOS/Unity" if ([string]::IsNullOrEmpty($modulesList)) { - $modules = @('mac-il2cpp', 'ios', 'lumin', 'webgl', 'android') + $modules = @('mac-il2cpp', 'ios', 'android') } # /Applications/Unity\ Hub.app/Contents/MacOS/Unity\ Hub -- --headless help @@ -63,7 +63,7 @@ elseif ( $global:PSVersionTable.OS.Contains("Linux") ) { $editorFileEx = "/Editor/Unity" if ([string]::IsNullOrEmpty($modulesList)) { - $modules = @('linux-il2cpp', 'webgl', 'android', 'ios') + $modules = @('linux-il2cpp', 'android', 'ios') } # /UnityHub.AppImage --headless help