@xrtk/activate-unity-license@v3 (#8)

XRTK · Nov 13, 2023 · 3fe7510 · 3fe7510
1 parent ca03736
commit 3fe7510
Show file tree

Hide file tree

Showing 8 changed files with 65 additions and 71 deletions.
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -10,15 +10,17 @@ on:
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
-
 concurrency:
   group: ${{ github.ref }}
 
+env:
+  UNITY_PROJECT_PATH: ''
+
 jobs:
   validate:
     runs-on: ${{ matrix.os }}
     strategy:
-      #max-parallel: 2 # Use this if you're activating pro license with matrix
+      max-parallel: 2 # Use this if you're activating pro license with matrix
       matrix:
         include:
           - os: ubuntu-latest
@@ -30,17 +32,17 @@ jobs:
 
     steps:
       - name: checkout self
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - run: npm install
 
       - name: checkout test project
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: xrtk/com.xrtk.test
           path: test-project
 
-      - uses: xrtk/unity-setup@v6
+      - uses: xrtk/unity-setup@v7.2
         with:
           version-file-path: 'test-project/**/ProjectSettings/ProjectVersion.txt'
 
@@ -52,10 +54,10 @@ jobs:
           password: ${{ secrets.UNITY_PASSWORD }}
           # Optional
           serial: ${{ secrets.UNITY_SERIAL }} # Required for pro/plus activations
-          license-type: 'Personal' # Chooses license type to use [ Personal, Professional ]
+          license-type: 'Professional' # Chooses license type to use [ Personal, Professional ]
 
       - name: Unity Build (${{ matrix.build-target }})
-        uses: xrtk/unity-action@v4
+        uses: xrtk/unity-action@v6
         with:
           log-name: 'project-validation'
           args: '-quit -nographics -batchmode -executeMethod XRTK.Editor.BuildPipeline.UnityPlayerBuildTools.ValidateProject'

diff --git a/README.md b/README.md
@@ -52,16 +52,16 @@ jobs:
 
     steps:
       - name: checkout self
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
         # Installs the Unity Editor based on your project version text file
         # sets -> env.UNITY_EDITOR_PATH
         # sets -> env.UNITY_PROJECT_PATH
         # https://github.com/XRTK/unity-setup
-      - uses: xrtk/unity-setup@v6
+      - uses: xrtk/unity-setup@v7.2
 
         # Activates the installation with the provided credentials
-      - uses: xrtk/activate-unity-license@v2
+      - uses: xrtk/activate-unity-license@v3
         with:
           # Required
           username: ${{ secrets.UNITY_USERNAME }}

diff --git a/dist/index.js b/dist/index.js
@@ -34214,17 +34214,15 @@ async function Run() {
             // Let's mask all of it.
             var maskedSerial = serial.slice(0, -4) + `XXXX`;
             core.setSecret(maskedSerial);
-
             core.startGroup(`Activate Unity Professional License`);
-            var args = `-quit -nographics -batchmode -username ${username} -password ${password} -serial ${serial}`;
+            var args = `-quit -nographics -batchmode -serial ${serial} -username ${username} -password ${password}`;
             var exitCode = await exec.exec(`"${pwsh}" -Command`, `${unity_action} -editorPath "${editorPath}" -projectPath "${projectPath}" -additionalArgs "${args}" -logName ProLicenseActivation`);
             core.endGroup();
         } else if (licenseType.toLowerCase().startsWith('per')) {
             // if personal license activate by using requesting activation file
             core.startGroup(`Generate Unity License Request File`);
             var exitCode = 0;
             var args = `-quit -nographics -batchmode -createManualActivationFile`;
-
             try {
                 exitCode = await exec.exec(`"${pwsh}" -Command`, `${unity_action} -editorPath "${editorPath}" -projectPath "${projectPath}" -additionalArgs "${args}" -logName ManualLicenseRequest`);
             } catch (error) {
@@ -54093,7 +54091,6 @@ var __webpack_exports__ = {};
 const core = __nccwpck_require__(2186);
 const activate = __nccwpck_require__(3816);
 const deactivate = __nccwpck_require__(8162);
-
 const IsPost = !!core.getState('isPost');
 
 const main = async () => {

diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/dist/unity-action.ps1 b/dist/unity-action.ps1
@@ -7,10 +7,11 @@ param(
     [String]$logName = "Unity"
 )
 
-try {
-    $buildArgs = ""
+$buildArgs = ""
+$process = $null
 
-    if ( -not [string]::IsNullOrEmpty($buildTarget) ) {
+try {
+    if (-not [string]::IsNullOrEmpty($buildTarget)) {
         $buildArgs += "-buildTarget `"$buildTarget`" "
     }
 
@@ -27,12 +28,11 @@ try {
 
         $logDirectory = "$projectPath/Builds/Logs"
 
-        if ( -not (Test-Path -Path $logDirectory)) {
+        if (-not (Test-Path -Path $logDirectory)) {
             $logDirectory = New-Item -ItemType Directory -Force -Path $logDirectory | Select-Object
         }
 
         Write-Host "Log Directory: $logDirectory"
-
         $date = Get-Date -Format "yyyyMMddTHHmmss"
         $fullLogName = "$logDirectory/$logName-$date"
         $logPath = "$fullLogName.log"
@@ -41,37 +41,34 @@ try {
 
     $additionalArgs = $additionalArgs.Trim()
 
-    if ( $additionalArgs -like "*runEditorTests" ) {
+    if ($additionalArgs -like "*runEditorTests") {
         $testPath = "$fullLogName.xml"
         $additionalArgs += " -editorTestsResultFile `"$testPath`""
     }
 
     $buildArgs = $buildArgs.Trim()
-
     $buildArgs += " $additionalArgs"
-
     $process = Start-Process -FilePath "$editorPath" -ArgumentList "$buildArgs" -PassThru
-
     $ljob = Start-Job -ScriptBlock {
         param($log)
 
-        while ( -not (Test-Path $log -Type Leaf) ) {
+        while (-not (Test-Path -Path $log -Type Leaf)) {
             Start-Sleep -Milliseconds 1
         }
 
-        Get-Content "$log" -Wait
+        Get-Content -Path $log -Wait | Write-Host
     } -ArgumentList $logPath
 
     $processId = $process.Id
+    Write-Output "::debug::Unity Process ID: $processId"
+    $processId | Out-File -FilePath "$env:GITHUB_WORKSPACE/unity-process-id.txt"
 
-    while ( -not $process.HasExited )
-    {
+    while (-not $process.HasExited) {
         # While waiting, Get-Content checks the file once each second
         Start-Sleep -Milliseconds 1
         Receive-Job $ljob
 
-        if ( $null -eq (Get-Process -Id $processId -ErrorAction SilentlyContinue) )
-        {
+        if ($null -eq (Get-Process -Id $processId -ErrorAction SilentlyContinue)) {
             break
         }
     }
@@ -82,8 +79,7 @@ try {
     $stopwatch = [System.Diagnostics.Stopwatch]::StartNew()
 
     do {
-        try
-        {
+        try {
             if (Test-Path -Path $logPath) {
                 $file = Convert-Path $logPath
                 $fileStream = [System.IO.File]::Open($file,'Open','Write')
@@ -93,15 +89,13 @@ try {
             } else {
                 $fileLocked = $false
             }
-        }
-        catch
-        {
+        } catch {
             $fileLocked = $true
+            Start-Sleep -Milliseconds 1
         }
 
-        if ( $stopwatch.elapsed -lt $timeout )
-        {
-            if ( (-not $global:PSVersionTable.Platform) -or ($global:PSVersionTable.Platform -eq "Win32NT") ) {
+        if ($stopwatch.elapsed -lt $timeout) {
+            if ((-not $global:PSVersionTable.Platform) -or ($global:PSVersionTable.Platform -eq "Win32NT")) {
                 $procsWithParent = Get-CimInstance -ClassName "win32_process" | Select-Object ProcessId,ParentProcessId
                 $orphaned = $procsWithParent | Where-Object -Property ParentProcessId -NotIn $procsWithParent.ProcessId
                 $procs = Get-Process -IncludeUserName | Where-Object -Property Id -In $orphaned.ProcessId | Where-Object { $_.UserName -match $env:username }
@@ -110,17 +104,22 @@ try {
         }
 
         Start-Sleep -Milliseconds 1
-    } while ( $fileLocked )
+    } while ($fileLocked)
 
     Start-Sleep -Milliseconds 1
-
     # Clean up job
     Receive-Job $ljob
     Stop-Job $ljob
     Remove-Job $ljob
-
     exit $process.ExitCode
 }
 catch {
+    $errorMessage = $_.Exception.Message
+    Write-Host "::error::An error occurred running unity-action.ps1: $errorMessage"
+
+    if ($process -and (-not $process.HasExited)) {
+        $process.Kill()
+    }
+
     exit 1
 }
diff --git a/src/activate.js b/src/activate.js
@@ -48,17 +48,15 @@ async function Run() {
             // Let's mask all of it.
             var maskedSerial = serial.slice(0, -4) + `XXXX`;
             core.setSecret(maskedSerial);
-
             core.startGroup(`Activate Unity Professional License`);
-            var args = `-quit -nographics -batchmode -username ${username} -password ${password} -serial ${serial}`;
+            var args = `-quit -nographics -batchmode -serial ${serial} -username ${username} -password ${password}`;
             var exitCode = await exec.exec(`"${pwsh}" -Command`, `${unity_action} -editorPath "${editorPath}" -projectPath "${projectPath}" -additionalArgs "${args}" -logName ProLicenseActivation`);
             core.endGroup();
         } else if (licenseType.toLowerCase().startsWith('per')) {
             // if personal license activate by using requesting activation file
             core.startGroup(`Generate Unity License Request File`);
             var exitCode = 0;
             var args = `-quit -nographics -batchmode -createManualActivationFile`;
-
             try {
                 exitCode = await exec.exec(`"${pwsh}" -Command`, `${unity_action} -editorPath "${editorPath}" -projectPath "${projectPath}" -additionalArgs "${args}" -logName ManualLicenseRequest`);
             } catch (error) {

diff --git a/src/index.js b/src/index.js
@@ -1,7 +1,6 @@
 const core = require('@actions/core');
 const activate = require('./activate');
 const deactivate = require('./deactivate');
-
 const IsPost = !!core.getState('isPost');
 
 const main = async () => {

diff --git a/src/unity-action.ps1 b/src/unity-action.ps1
@@ -7,10 +7,11 @@ param(
     [String]$logName = "Unity"
 )
 
-try {
-    $buildArgs = ""
+$buildArgs = ""
+$process = $null
 
-    if ( -not [string]::IsNullOrEmpty($buildTarget) ) {
+try {
+    if (-not [string]::IsNullOrEmpty($buildTarget)) {
         $buildArgs += "-buildTarget `"$buildTarget`" "
     }
 
@@ -27,12 +28,11 @@ try {
 
         $logDirectory = "$projectPath/Builds/Logs"
 
-        if ( -not (Test-Path -Path $logDirectory)) {
+        if (-not (Test-Path -Path $logDirectory)) {
             $logDirectory = New-Item -ItemType Directory -Force -Path $logDirectory | Select-Object
         }
 
         Write-Host "Log Directory: $logDirectory"
-
         $date = Get-Date -Format "yyyyMMddTHHmmss"
         $fullLogName = "$logDirectory/$logName-$date"
         $logPath = "$fullLogName.log"
@@ -41,37 +41,34 @@ try {
 
     $additionalArgs = $additionalArgs.Trim()
 
-    if ( $additionalArgs -like "*runEditorTests" ) {
+    if ($additionalArgs -like "*runEditorTests") {
         $testPath = "$fullLogName.xml"
         $additionalArgs += " -editorTestsResultFile `"$testPath`""
     }
 
     $buildArgs = $buildArgs.Trim()
-
     $buildArgs += " $additionalArgs"
-
     $process = Start-Process -FilePath "$editorPath" -ArgumentList "$buildArgs" -PassThru
-
     $ljob = Start-Job -ScriptBlock {
         param($log)
 
-        while ( -not (Test-Path $log -Type Leaf) ) {
+        while (-not (Test-Path -Path $log -Type Leaf)) {
             Start-Sleep -Milliseconds 1
         }
 
-        Get-Content "$log" -Wait
+        Get-Content -Path $log -Wait | Write-Host
     } -ArgumentList $logPath
 
     $processId = $process.Id
+    Write-Output "::debug::Unity Process ID: $processId"
+    $processId | Out-File -FilePath "$env:GITHUB_WORKSPACE/unity-process-id.txt"
 
-    while ( -not $process.HasExited )
-    {
+    while (-not $process.HasExited) {
         # While waiting, Get-Content checks the file once each second
         Start-Sleep -Milliseconds 1
         Receive-Job $ljob
 
-        if ( $null -eq (Get-Process -Id $processId -ErrorAction SilentlyContinue) )
-        {
+        if ($null -eq (Get-Process -Id $processId -ErrorAction SilentlyContinue)) {
             break
         }
     }
@@ -82,8 +79,7 @@ try {
     $stopwatch = [System.Diagnostics.Stopwatch]::StartNew()
 
     do {
-        try
-        {
+        try {
             if (Test-Path -Path $logPath) {
                 $file = Convert-Path $logPath
                 $fileStream = [System.IO.File]::Open($file,'Open','Write')
@@ -93,15 +89,13 @@ try {
             } else {
                 $fileLocked = $false
             }
-        }
-        catch
-        {
+        } catch {
             $fileLocked = $true
+            Start-Sleep -Milliseconds 1
         }
 
-        if ( $stopwatch.elapsed -lt $timeout )
-        {
-            if ( (-not $global:PSVersionTable.Platform) -or ($global:PSVersionTable.Platform -eq "Win32NT") ) {
+        if ($stopwatch.elapsed -lt $timeout) {
+            if ((-not $global:PSVersionTable.Platform) -or ($global:PSVersionTable.Platform -eq "Win32NT")) {
                 $procsWithParent = Get-CimInstance -ClassName "win32_process" | Select-Object ProcessId,ParentProcessId
                 $orphaned = $procsWithParent | Where-Object -Property ParentProcessId -NotIn $procsWithParent.ProcessId
                 $procs = Get-Process -IncludeUserName | Where-Object -Property Id -In $orphaned.ProcessId | Where-Object { $_.UserName -match $env:username }
@@ -110,17 +104,22 @@ try {
         }
 
         Start-Sleep -Milliseconds 1
-    } while ( $fileLocked )
+    } while ($fileLocked)
 
     Start-Sleep -Milliseconds 1
-
     # Clean up job
     Receive-Job $ljob
     Stop-Job $ljob
     Remove-Job $ljob
-
     exit $process.ExitCode
 }
 catch {
+    $errorMessage = $_.Exception.Message
+    Write-Host "::error::An error occurred running unity-action.ps1: $errorMessage"
+
+    if ($process -and (-not $process.HasExited)) {
+        $process.Kill()
+    }
+
     exit 1
 }