pengtaihao
/
com.unity.uiextensions
mirror of https://github.com/Unity-UI-Extensions/com.unity.uiextensions
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #482 from Unity-UI-Extensions/feature/workflows 

Feature/workflows
development
Simon (Darkside) Jackson 2024-10-04 13:16:10 +01:00 committed by GitHub
parent 2d5c46ed35 16e8f172fc
commit f8a24f522d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 95 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/getpackageversionfrompackage.yml vendored
View File

@ -25,11 +25,11 @@ jobs:
- name: Script Version - name: Script Version
run: | run: |
echo "::group::Script Versioning" echo "::group::Script Versioning"
$scriptVersion = "1.0.0" $scriptVersion = "1.0.1"
echo "Build Script Version: $scriptVersion" echo "Build Script Version: $scriptVersion"
echo "::endgroup::" echo "::endgroup::"
shell: pwsh shell: pwsh
- uses: actions/checkout@v3 - uses: actions/checkout@v4
with: with:
submodules: recursive submodules: recursive
clean: true clean: true

89
.github/workflows/rununitybuildmultiversion.yml vendored
View File

@ -64,26 +64,30 @@ jobs:
unityVersion: 2022.3 unityVersion: 2022.3
build-target: WSAPlayer build-target: WSAPlayer
- os: windows - os: windows
unityVersion: 2023.1 unityVersion: 6000.0
build-target: Android build-target: Android
- os: macOS
unityVersion: 2023.1
build-target: iOS
- os: windows - os: windows
unityVersion: 2023.1 unityVersion: 6000.0
build-target: StandaloneWindows64 build-target: StandaloneWindows64
- os: windows - os: windows
unityVersion: 2023.1 unityVersion: 6000.0
build-target: WSAPlayer build-target: WSAPlayer
- os: macos
unityVersion: 6000.0
build-target: iOS
- os: macos
unityVersion: 6000.0
build-target: StandaloneOSX
steps: steps:
- name: Script Version - name: Script Version
run: | run: |
echo "::group::Script Versioning" echo "::group::Script Versioning"
$scriptVersion = "1.0.0" $scriptVersion = "1.0.1"
echo "Build Script Version: $scriptVersion" echo "Build Script Version: $scriptVersion"
echo "::endgroup::" echo "::endgroup::"
shell: pwsh shell: pwsh
- uses: actions/checkout@v3 - uses: actions/checkout@v4
with: with:
submodules: recursive submodules: recursive
clean: true clean: true
@ -91,8 +95,8 @@ jobs:
- id: build - id: build
name: 'Run Unity Builds' name: 'Run Unity Builds'
run: | run: |
echo "::group::Set Hub and editor locations"
$unityVersion = '${{ matrix.unityVersion }}' $unityVersion = '${{ matrix.unityVersion }}'
$unityMajorVersion = $unityVersion.Substring(0, 4)
echo "::group::Set Hub and editor locations" echo "::group::Set Hub and editor locations"
@ -100,26 +104,28 @@ jobs:
if ( (-not $global:PSVersionTable.Platform) -or ($global:PSVersionTable.Platform -eq "Win32NT") ) if ( (-not $global:PSVersionTable.Platform) -or ($global:PSVersionTable.Platform -eq "Win32NT") )
{ {
$hubPath = "C:\Program Files\Unity Hub\Unity Hub.exe" $hubPath = "C:\Program Files\Unity Hub\Unity Hub.exe"
$editorRootPath = "C:\Program Files\Unity\Hub\Editor\"
$editorFileEx = "\Editor\Unity.exe"
$directorySeparatorChar = "\"
#"Unity Hub.exe" -- --headless help #"Unity Hub.exe" -- --headless help
#. 'C:\Program Files\Unity Hub\Unity Hub.exe' -- --headless help #. 'C:\Program Files\Unity Hub\Unity Hub.exe' -- --headless help
function unity-hub function unity-hub
{
& $hubPath -- --headless $args.Split(" ") | Out-String
}
function unity-hub-raw
{ {
& $hubPath -- --headless $args.Split(" ") | Out-String -NoNewline & $hubPath -- --headless $args.Split(" ") | Out-String -NoNewline
} }
} }
elseif ( $global:PSVersionTable.OS.Contains("Darwin") ) elseif ( $global:PSVersionTable.OS.Contains("Darwin") )
{ {
$hubPath = "/Applications/Unity Hub.app/Contents/macOS/Unity Hub" $hubPath = "/Applications/Unity Hub.app/Contents/MacOS/Unity Hub"
$editorRootPath = "/Applications/Unity/Hub/Editor/"
$editorFileEx = "/Unity.app/Contents/macOS/Unity"
$directorySeparatorChar = "/"
# /Applications/Unity\ Hub.app/Contents/macOS/Unity\ Hub -- --headless help # /Applications/Unity\ Hub.app/Contents/MacOS/Unity\ Hub -- --headless help
function unity-hub function unity-hub
{
& $hubPath -- --headless $args.Split(" ") | Out-String
}
function unity-hub-raw
{ {
& $hubPath -- --headless $args.Split(" ") | Out-String -NoNewline & $hubPath -- --headless $args.Split(" ") | Out-String -NoNewline
} }
@ -127,9 +133,6 @@ jobs:
elseif ( $global:PSVersionTable.OS.Contains("Linux") ) elseif ( $global:PSVersionTable.OS.Contains("Linux") )
{ {
$hubPath = "$HOME/Unity Hub/UnityHub.AppImage" $hubPath = "$HOME/Unity Hub/UnityHub.AppImage"
$editorRootPath = "$HOME/Unity/Hub/Editor/"
$editorFileEx = "/Editor/Unity"
$directorySeparatorChar = "/"
# /UnityHub.AppImage --headless help # /UnityHub.AppImage --headless help
# xvfb-run --auto-servernum "$HOME/Unity Hub/UnityHub.AppImage" --headless help # xvfb-run --auto-servernum "$HOME/Unity Hub/UnityHub.AppImage" --headless help
@ -137,6 +140,10 @@ jobs:
{ {
xvfb-run --auto-servernum "$hubPath" --headless $args.Split(" ") xvfb-run --auto-servernum "$hubPath" --headless $args.Split(" ")
} }
function unity-hub-raw
{
xvfb-run --auto-servernum "$hubPath" --headless $args.Split(" ")
}
} }
echo "::endgroup::" echo "::endgroup::"
@ -168,7 +175,7 @@ jobs:
echo "Requested unity version is {$unityVersion}" echo "Requested unity version is {$unityVersion}"
$InstalledUnityVersions = unity-hub editors $InstalledUnityVersions = unity-hub editors
$editorRootPath = unity-hub ip -g $editorRootPath = unity-hub-raw ip -g
echo "Installed unity versions are {$InstalledUnityVersions}" echo "Installed unity versions are {$InstalledUnityVersions}"
echo "Unity install path is {$editorRootPath}" echo "Unity install path is {$editorRootPath}"
@ -230,7 +237,7 @@ jobs:
} }
elseif ( $global:PSVersionTable.OS.Contains("Darwin") ) { elseif ( $global:PSVersionTable.OS.Contains("Darwin") ) {
echo 'Building using Mac' echo 'Building using Mac'
$editorFileEx = "/Unity.app/Contents/macOS/Unity" $editorFileEx = "/Unity.app/Contents/MacOS/Unity"
$editorrunpath = Join-Path $editorRootPath $unityVersion $editorFileEx $editorrunpath = Join-Path $editorRootPath $unityVersion $editorFileEx
function unity-editor { function unity-editor {
@ -283,14 +290,13 @@ jobs:
# If run manually, the Refname is actually blank, so just use date # If run manually, the Refname is actually blank, so just use date
if([string]::IsNullOrEmpty(${GITHUB_REF_NAME})) { if([string]::IsNullOrEmpty(${GITHUB_REF_NAME})) {
$logName = "$logDirectory$directorySeparatorChar$date" $logName = Join-Path $logDirectory $date
} }else {
else{ $logName = Join-Path $logDirectory ${GITHUB_REF_NAME}-$date
$logName = "$logDirectory$directorySeparatorChar${GITHUB_REF_NAME}-$date"
} }
$logPath = "$logName.log" $logPath = "$unityMajorVersion_${{ matrix.build-target }}_$logName.log"
$testsLogPath = "$logName-tests.xml" $testsLogPath = "$unityMajorVersion_${{ matrix.build-target }}_$logName-tests.xml"
echo "Logpath [$logPath]" echo "Logpath [$logPath]"
echo "TestsPath [$testsLogPath]" echo "TestsPath [$testsLogPath]"
@ -313,9 +319,20 @@ jobs:
$TempUnityProjectName = 'P' $TempUnityProjectName = 'P'
unity-editor '-createProject' $TempUnityProjectName -quit unity-editor '-createProject' $TempUnityProjectName '-logFile' $logPath '-quit'
$destinationPath = $TempUnityProjectName + $directorySeparatorChar + 'packages' if ( -not (Test-Path "$TempUnityProjectName") )
{
$ProjectPath = Get-Location
Write-Error "Editor failed to create project not Found $ProjectPath/$TempUnityProjectName"
exit 1
}
else {
$ProjectPath = Get-Location
echo "Editor project created at $ProjectPath/$TempUnityProjectName"
}
$destinationPath = Join-Path $TempUnityProjectName 'packages'
Move-Item -Path $UPMFolderName -Destination $destinationPath Move-Item -Path $UPMFolderName -Destination $destinationPath
echo "::endgroup::" echo "::endgroup::"
@ -348,10 +365,9 @@ jobs:
# Read dependancy input value # Read dependancy input value
$dependencies = '${{ inputs.dependencies }}' $dependencies = '${{ inputs.dependencies }}'
if([string]::IsNullOrEmpty('${{ secrets.GIT_USER_NAME }}') -or [string]::IsNullOrEmpty('${{ secrets.GIT_PAT }}')){ if([string]::IsNullOrEmpty('${{ github.actor }}') -or [string]::IsNullOrEmpty('${{ secrets.GITHUB_TOKEN }}')){
echo "" echo ""
echo "Secrets for GIT_USER_NAME or GIT_PAT missing, please register them with access to this runner" echo "Insufficient credentials supplied to activate the workflow"
echo "*Note, Organisation secrets are not accessible to Forked repos and need registering in the local fork"
exit 1 exit 1
} }
@ -362,7 +378,7 @@ jobs:
echo $JSONdependencies echo $JSONdependencies
# Read current Manifest json # Read current Manifest json
$manifestPath = $destinationPath + $directorySeparatorChar + 'manifest.json' $manifestPath = Join-Path $destinationPath 'manifest.json'
$projectManifest = Get-Content -Path $manifestPath | ConvertFrom-Json $projectManifest = Get-Content -Path $manifestPath | ConvertFrom-Json
$strArray = $projectManifest.dependencies.PsObject.Properties | ForEach-Object {"$($_.Name)@$($_.Value),"} $strArray = $projectManifest.dependencies.PsObject.Properties | ForEach-Object {"$($_.Name)@$($_.Value),"}
@ -375,7 +391,7 @@ jobs:
$dependencyURL = $_.Value $dependencyURL = $_.Value
echo "---------------------------------------------" echo "---------------------------------------------"
echo "Cloning dependency - Name [$dependencyName] - Path [$dependencyPath] - URL [$dependencyURL]" echo "Cloning dependency - Name [$dependencyName] - Path [$dependencyPath] - URL [$dependencyURL]"
$cloneURL = "https://${{ secrets.GIT_USER_NAME }}:${{ secrets.GIT_PAT }}@$dependencyURL" $cloneURL = "https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@$dependencyURL"
echo "cloning $dependencyName from $dependencyURL and moving to $destinationPath" echo "cloning $dependencyName from $dependencyURL and moving to $destinationPath"
echo "git path - $cloneURL" echo "git path - $cloneURL"
@ -461,11 +477,10 @@ jobs:
exit $LASTEXITCODE exit $LASTEXITCODE
} }
echo "::endgroup::"
shell: pwsh shell: pwsh
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v3
if: always() if: always()
with: with:
name: unity-build-log name: unity-build-log-${{ matrix.unityVersion }}-${{ matrix.build-target }}
path: Logs/** path: Logs/**

47
.github/workflows/rununitysinglebuild.yml vendored
View File

@ -32,18 +32,17 @@ jobs:
- name: Script Version - name: Script Version
run: | run: |
echo "::group::Script Versioning" echo "::group::Script Versioning"
$scriptVersion = "1.0.0" $scriptVersion = "1.0.1"
echo "Build Script Version: $scriptVersion" echo "Build Script Version: $scriptVersion"
echo "::endgroup::" echo "::endgroup::"
shell: pwsh shell: pwsh
- uses: actions/checkout@v3 - uses: actions/checkout@v4
with: with:
submodules: recursive submodules: recursive
clean: true clean: true
- id: build - id: build
name: 'Run Unity Builds' name: 'Run Unity Builds'
run: | run: |
echo "::group::Set Hub and editor locations"
$unityVersion = '${{ inputs.unityVersion }}' $unityVersion = '${{ inputs.unityVersion }}'
echo "::group::Set Hub and editor locations" echo "::group::Set Hub and editor locations"
@ -53,8 +52,6 @@ jobs:
{ {
$hubPath = "C:\Program Files\Unity Hub\Unity Hub.exe" $hubPath = "C:\Program Files\Unity Hub\Unity Hub.exe"
$editorRootPath = "C:\Program Files\Unity\Hub\Editor\" $editorRootPath = "C:\Program Files\Unity\Hub\Editor\"
$editorFileEx = "\Editor\Unity.exe"
$directorySeparatorChar = "\"
#"Unity Hub.exe" -- --headless help #"Unity Hub.exe" -- --headless help
#. 'C:\Program Files\Unity Hub\Unity Hub.exe' -- --headless help #. 'C:\Program Files\Unity Hub\Unity Hub.exe' -- --headless help
@ -67,8 +64,6 @@ jobs:
{ {
$hubPath = "/Applications/Unity Hub.app/Contents/MacOS/Unity Hub" $hubPath = "/Applications/Unity Hub.app/Contents/MacOS/Unity Hub"
$editorRootPath = "/Applications/Unity/Hub/Editor/" $editorRootPath = "/Applications/Unity/Hub/Editor/"
$editorFileEx = "/Unity.app/Contents/MacOS/Unity"
$directorySeparatorChar = "/"
# /Applications/Unity\ Hub.app/Contents/MacOS/Unity\ Hub -- --headless help # /Applications/Unity\ Hub.app/Contents/MacOS/Unity\ Hub -- --headless help
function unity-hub function unity-hub
@ -80,8 +75,6 @@ jobs:
{ {
$hubPath = "$HOME/Unity Hub/UnityHub.AppImage" $hubPath = "$HOME/Unity Hub/UnityHub.AppImage"
$editorRootPath = "$HOME/Unity/Hub/Editor/" $editorRootPath = "$HOME/Unity/Hub/Editor/"
$editorFileEx = "/Editor/Unity"
$directorySeparatorChar = "/"
# /UnityHub.AppImage --headless help # /UnityHub.AppImage --headless help
# xvfb-run --auto-servernum "$HOME/Unity Hub/UnityHub.AppImage" --headless help # xvfb-run --auto-servernum "$HOME/Unity Hub/UnityHub.AppImage" --headless help
@ -235,10 +228,9 @@ jobs:
# If run manually, the Refname is actually blank, so just use date # If run manually, the Refname is actually blank, so just use date
if([string]::IsNullOrEmpty(${GITHUB_REF_NAME})) { if([string]::IsNullOrEmpty(${GITHUB_REF_NAME})) {
$logName = "$logDirectory$directorySeparatorChar$date" $logName = Join-Path $logDirectory $date
} }else {
else{ $logName = Join-Path $logDirectory ${GITHUB_REF_NAME}-$date
$logName = "$logDirectory$directorySeparatorChar${GITHUB_REF_NAME}-$date"
} }
$logPath = "$logName.log" $logPath = "$logName.log"
@ -265,9 +257,20 @@ jobs:
$TempUnityProjectName = 'P' $TempUnityProjectName = 'P'
unity-editor '-createProject' $TempUnityProjectName -quit unity-editor '-createProject' $TempUnityProjectName '-logFile' $logPath '-quit'
$destinationPath = $TempUnityProjectName + $directorySeparatorChar + 'packages' if ( -not (Test-Path "$TempUnityProjectName") )
{
$ProjectPath = Get-Location
Write-Error "Editor failed to create project not Found $ProjectPath/$TempUnityProjectName"
exit 1
}
else {
$ProjectPath = Get-Location
echo "Editor project created at $ProjectPath/$TempUnityProjectName"
}
$destinationPath = Join-Path $TempUnityProjectName 'packages'
Move-Item -Path $UPMFolderName -Destination $destinationPath Move-Item -Path $UPMFolderName -Destination $destinationPath
echo "::endgroup::" echo "::endgroup::"
@ -300,10 +303,9 @@ jobs:
# Read dependancy input value # Read dependancy input value
$dependencies = '${{ inputs.dependencies }}' $dependencies = '${{ inputs.dependencies }}'
if([string]::IsNullOrEmpty('${{ secrets.GIT_USER_NAME }}') -or [string]::IsNullOrEmpty('${{ secrets.GIT_PAT }}')){ if([string]::IsNullOrEmpty('${{ github.actor }}') -or [string]::IsNullOrEmpty('${{ secrets.GITHUB_TOKEN }}')){
echo "" echo ""
echo "Secrets for GIT_USER_NAME or GIT_PAT missing, please register them with access to this runner" echo "Insufficient credentials supplied to activate the workflow"
echo "*Note, Organisation secrets are not accessible to Forked repos and need registering in the local fork"
exit 1 exit 1
} }
@ -314,7 +316,7 @@ jobs:
echo $JSONdependencies echo $JSONdependencies
# Read current Manifest json # Read current Manifest json
$manifestPath = $destinationPath + $directorySeparatorChar + 'manifest.json' $manifestPath = Join-Path $destinationPath 'manifest.json'
$projectManifest = Get-Content -Path $manifestPath | ConvertFrom-Json $projectManifest = Get-Content -Path $manifestPath | ConvertFrom-Json
$strArray = $projectManifest.dependencies.PsObject.Properties | ForEach-Object {"$($_.Name)@$($_.Value),"} $strArray = $projectManifest.dependencies.PsObject.Properties | ForEach-Object {"$($_.Name)@$($_.Value),"}
@ -327,7 +329,7 @@ jobs:
$dependencyURL = $_.Value $dependencyURL = $_.Value
echo "---------------------------------------------" echo "---------------------------------------------"
echo "Cloning dependency - Name [$dependencyName] - Path [$dependencyPath] - URL [$dependencyURL]" echo "Cloning dependency - Name [$dependencyName] - Path [$dependencyPath] - URL [$dependencyURL]"
$cloneURL = "https://${{ secrets.GIT_USER_NAME }}:${{ secrets.GIT_PAT }}@$dependencyURL" $cloneURL = "https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@$dependencyURL"
echo "cloning $dependencyName from $dependencyURL and moving to $destinationPath" echo "cloning $dependencyName from $dependencyURL and moving to $destinationPath"
echo "git path - $cloneURL" echo "git path - $cloneURL"
@ -413,11 +415,10 @@ jobs:
exit $LASTEXITCODE exit $LASTEXITCODE
} }
echo "::endgroup::"
shell: pwsh shell: pwsh
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v4
if: always() if: always()
with: with:
name: unity-build-log name: unity-build-log-${{ matrix.build-target }}
path: Logs/** path: Logs/**

8
.github/workflows/tagrelease.yml vendored
View File

@ -27,17 +27,17 @@ jobs:
- name: Script Version - name: Script Version
run: | run: |
echo "::group::Script Versioning" echo "::group::Script Versioning"
$scriptVersion = "1.0.2" $scriptVersion = "1.0.3"
echo "Build Script Version: $scriptVersion" echo "Build Script Version: $scriptVersion"
echo "::endgroup::" echo "::endgroup::"
shell: pwsh shell: pwsh
- uses: actions/checkout@v3 - uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0
submodules: recursive submodules: recursive
clean: true clean: true
token: ${{ secrets.GIT_PAT }} token: ${{ secrets.GIT_PAT }}
- uses: actions/setup-node@v3 - uses: actions/setup-node@v4
- name: Set Github vars - name: Set Github vars
run: | run: |
if([string]::IsNullOrEmpty('${{ secrets.GIT_USER_NAME }}')){ if([string]::IsNullOrEmpty('${{ secrets.GIT_USER_NAME }}')){
@ -74,6 +74,6 @@ jobs:
- name: Create tag and push - name: Create tag and push
run: | run: |
$tagVersion = "${{ inputs.version }}" $tagVersion = "${{ inputs.version }}"
git tag -fa "v$tagVersion" "${GITHUB_SHA}" -m "v$tagVersion Release [skip ci]" git tag -fa "v$tagVersion" -m "v$tagVersion Release [skip ci]"
git push origin "v$tagVersion" --force git push origin "v$tagVersion" --force
shell: pwsh shell: pwsh

12
.github/workflows/upversionandtagrelease.yml vendored
View File

@ -31,8 +31,8 @@ on:
description: "Returns the version of Unity the UPM package requires" description: "Returns the version of Unity the UPM package requires"
value: ${{ jobs.packageRelease.outputs.packageversion }} value: ${{ jobs.packageRelease.outputs.packageversion }}
secrets: secrets:
GIT_PAT: GIT_USER_NAME:
required: true required: false
jobs: jobs:
packageRelease: packageRelease:
@ -44,18 +44,18 @@ jobs:
- name: Script Version - name: Script Version
run: | run: |
echo "::group::Script Versioning" echo "::group::Script Versioning"
$scriptVersion = "1.0.2" $scriptVersion = "1.0.3"
echo "Build Script Version: $scriptVersion" echo "Build Script Version: $scriptVersion"
echo "::endgroup::" echo "::endgroup::"
shell: pwsh shell: pwsh
- uses: actions/checkout@v3 - uses: actions/checkout@v4
with: with:
ref: ${{ inputs.target-branch }} ref: ${{ inputs.target-branch }}
fetch-depth: 0 fetch-depth: 0
submodules: recursive submodules: recursive
clean: true clean: true
token: ${{ secrets.GIT_PAT }} token: ${{ secrets.GIT_PAT }}
- uses: actions/setup-node@v3 - uses: actions/setup-node@v4
- name: Set Github vars - name: Set Github vars
run: | run: |
if([string]::IsNullOrEmpty('${{ secrets.GIT_USER_NAME }}')){ if([string]::IsNullOrEmpty('${{ secrets.GIT_USER_NAME }}')){
@ -176,6 +176,6 @@ jobs:
if: ${{inputs.createTag == true}} if: ${{inputs.createTag == true}}
run: | run: |
$outputVersion = '${{steps.getpackageversion.outputs.packageversion }}' $outputVersion = '${{steps.getpackageversion.outputs.packageversion }}'
git tag -fa "v$outputVersion" "${GITHUB_SHA}" -m "v$outputVersion Release" git tag -fa "v$outputVersion" -m "v$outputVersion Release"
git push origin "v$outputVersion" --force --tags git push origin "v$outputVersion" --force --tags
shell: pwsh shell: pwsh