EthanPisani/unity-builder
1
0
Fork 0
mirror of https://github.com/game-ci/unity-builder.git synced 2025-07-04 12:25:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix Windows Arguments Passed to Unity (#623)

Browse Source 
* Add missing parameter, add quotes around variables, bump action versions

* Wrap quotes

* Fix upload artifact naming conflict
This commit is contained in:
Andrew Kahr 2024-01-21 02:45:33 -08:00 committed by GitHub
parent 5ba81971e2
commit 2800d14403
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/build-tests-mac.yml vendored
View File

@ -37,7 +37,7 @@ jobs:
########################### ###########################
# Cache # # Cache #
########################### ###########################
- uses: actions/cache@v3 - uses: actions/cache@v4
with: with:
path: ${{ matrix.projectPath }}/Library path: ${{ matrix.projectPath }}/Library
key: Library-${{ matrix.projectPath }}-macos-${{ matrix.targetPlatform }} key: Library-${{ matrix.projectPath }}-macos-${{ matrix.targetPlatform }}
@ -61,6 +61,7 @@ jobs:
UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }} UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }} UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
with: with:
buildName: 'GameCI Test Build'
projectPath: ${{ matrix.projectPath }} projectPath: ${{ matrix.projectPath }}
unityVersion: ${{ matrix.unityVersion }} unityVersion: ${{ matrix.unityVersion }}
targetPlatform: ${{ matrix.targetPlatform }} targetPlatform: ${{ matrix.targetPlatform }}
@ -71,8 +72,8 @@ jobs:
########################### ###########################
# Upload # # Upload #
########################### ###########################
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v4
with: with:
name: Build MacOS (${{ matrix.unityVersion }}) name: Build ${{ matrix.targetPlatform }} on MacOS (${{ matrix.unityVersion }})
path: build path: build
retention-days: 14 retention-days: 14

9
.github/workflows/build-tests-ubuntu.yml vendored
View File

@ -69,7 +69,7 @@ jobs:
########################### ###########################
# Cache # # Cache #
########################### ###########################
- uses: actions/cache@v3 - uses: actions/cache@v4
with: with:
path: ${{ matrix.projectPath }}/Library path: ${{ matrix.projectPath }}/Library
key: Library-${{ matrix.projectPath }}-ubuntu-${{ matrix.targetPlatform }} key: Library-${{ matrix.projectPath }}-ubuntu-${{ matrix.targetPlatform }}
@ -88,6 +88,7 @@ jobs:
UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }} UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }} UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
with: with:
buildName: 'GameCI Test Build'
projectPath: ${{ matrix.projectPath }} projectPath: ${{ matrix.projectPath }}
unityVersion: ${{ matrix.unityVersion }} unityVersion: ${{ matrix.unityVersion }}
targetPlatform: ${{ matrix.targetPlatform }} targetPlatform: ${{ matrix.targetPlatform }}
@ -108,6 +109,7 @@ jobs:
UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }} UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }} UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
with: with:
buildName: 'GameCI Test Build'
projectPath: ${{ matrix.projectPath }} projectPath: ${{ matrix.projectPath }}
unityVersion: ${{ matrix.unityVersion }} unityVersion: ${{ matrix.unityVersion }}
targetPlatform: ${{ matrix.targetPlatform }} targetPlatform: ${{ matrix.targetPlatform }}
@ -128,6 +130,7 @@ jobs:
UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }} UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }} UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
with: with:
buildName: 'GameCI Test Build'
projectPath: ${{ matrix.projectPath }} projectPath: ${{ matrix.projectPath }}
unityVersion: ${{ matrix.unityVersion }} unityVersion: ${{ matrix.unityVersion }}
targetPlatform: ${{ matrix.targetPlatform }} targetPlatform: ${{ matrix.targetPlatform }}
@ -138,8 +141,8 @@ jobs:
########################### ###########################
# Upload # # Upload #
########################### ###########################
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v4
with: with:
name: Build Ubuntu (${{ matrix.unityVersion }}) name: Build ${{ matrix.targetPlatform }} on Ubuntu (${{ matrix.unityVersion }})
path: build path: build
retention-days: 14 retention-days: 14

9
.github/workflows/build-tests-windows.yml vendored
View File

@ -39,7 +39,7 @@ jobs:
########################### ###########################
# Cache # # Cache #
########################### ###########################
- uses: actions/cache@v3 - uses: actions/cache@v4
with: with:
path: ${{ matrix.projectPath }}/Library path: ${{ matrix.projectPath }}/Library
key: Library-${{ matrix.projectPath }}-windows-${{ matrix.targetPlatform }} key: Library-${{ matrix.projectPath }}-windows-${{ matrix.targetPlatform }}
@ -67,6 +67,7 @@ jobs:
UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }} UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }} UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
with: with:
buildName: 'GameCI Test Build'
projectPath: ${{ matrix.projectPath }} projectPath: ${{ matrix.projectPath }}
unityVersion: ${{ matrix.unityVersion }} unityVersion: ${{ matrix.unityVersion }}
targetPlatform: ${{ matrix.targetPlatform }} targetPlatform: ${{ matrix.targetPlatform }}
@ -90,6 +91,7 @@ jobs:
UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }} UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }} UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
with: with:
buildName: 'GameCI Test Build'
projectPath: ${{ matrix.projectPath }} projectPath: ${{ matrix.projectPath }}
unityVersion: ${{ matrix.unityVersion }} unityVersion: ${{ matrix.unityVersion }}
targetPlatform: ${{ matrix.targetPlatform }} targetPlatform: ${{ matrix.targetPlatform }}
@ -112,6 +114,7 @@ jobs:
UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }} UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }} UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
with: with:
buildName: 'GameCI Test Build'
projectPath: ${{ matrix.projectPath }} projectPath: ${{ matrix.projectPath }}
unityVersion: ${{ matrix.unityVersion }} unityVersion: ${{ matrix.unityVersion }}
targetPlatform: ${{ matrix.targetPlatform }} targetPlatform: ${{ matrix.targetPlatform }}
@ -122,8 +125,8 @@ jobs:
########################### ###########################
# Upload # # Upload #
########################### ###########################
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v4
with: with:
name: Build Windows (${{ matrix.unityVersion }}) name: Build ${{ matrix.targetPlatform }} on Windows (${{ matrix.unityVersion }})
path: build path: build
retention-days: 14 retention-days: 14

27
dist/platforms/windows/build.ps1 vendored
View File

@ -137,19 +137,20 @@ $unityArgs = @(
"-batchmode", "-batchmode",
"-nographics", "-nographics",
"-silent-crashes", "-silent-crashes",
"-projectPath", $Env:UNITY_PROJECT_PATH, "-customBuildName", "`"$Env:BUILD_NAME`"",
"-executeMethod", $Env:BUILD_METHOD, "-projectPath", "`"$Env:UNITY_PROJECT_PATH`"",
"-buildTarget", $Env:BUILD_TARGET, "-executeMethod", "`"$Env:BUILD_METHOD`"",
"-customBuildTarget", $Env:BUILD_TARGET, "-buildTarget", "`"$Env:BUILD_TARGET`"",
"-customBuildPath", $Env:CUSTOM_BUILD_PATH, "-customBuildTarget", "`"$Env:BUILD_TARGET`"",
"-buildVersion", $Env:VERSION, "-customBuildPath", "`"$Env:CUSTOM_BUILD_PATH`"",
"-androidVersionCode", $Env:ANDROID_VERSION_CODE, "-buildVersion", "`"$Env:VERSION`"",
"-androidKeystorePass", $Env:ANDROID_KEYSTORE_PASS, "-androidVersionCode", "`"$Env:ANDROID_VERSION_CODE`"",
"-androidKeyaliasName", $Env:ANDROID_KEYALIAS_NAME, "-androidKeystorePass", "`"$Env:ANDROID_KEYSTORE_PASS`"",
"-androidKeyaliasPass", $Env:ANDROID_KEYALIAS_PASS, "-androidKeyaliasName", "`"$Env:ANDROID_KEYALIAS_NAME`"",
"-androidTargetSdkVersion", $Env:ANDROID_TARGET_SDK_VERSION, "-androidKeyaliasPass", "`"$Env:ANDROID_KEYALIAS_PASS`"",
"-androidExportType", $Env:ANDROID_EXPORT_TYPE, "-androidTargetSdkVersion", "`"$Env:ANDROID_TARGET_SDK_VERSION`"",
"-androidSymbolType", $Env:ANDROID_SYMBOL_TYPE, "-androidExportType", "`"$Env:ANDROID_EXPORT_TYPE`"",
"-androidSymbolType", "`"$Env:ANDROID_SYMBOL_TYPE`"",
"-logfile", "-" "-logfile", "-"
) + $customParametersArray ) + $customParametersArray