diff --git a/TestProject/Packages/manifest.json b/TestProject/Packages/manifest.json index b08495a..1f31a7a 100644 --- a/TestProject/Packages/manifest.json +++ b/TestProject/Packages/manifest.json @@ -5,7 +5,7 @@ "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.physics": "1.0.0", "com.unity.modules.uielements": "1.0.0", - "org.gamecult.cultlib": "file:../../../CultLib/artifacts/unity/org.gamecult.cultlib", + "org.gamecult.cultlib": "file:../../artifacts/test-dependencies/org.gamecult.cultlib", "org.gamecult.eve.plugin-fields": "file:../../../EvePlugins/plugins/eve-plugin-fields/unity/org.gamecult.eve.plugin-fields", "org.gamecult.eve.surface": "file:../../packages/org.gamecult.eve.surface", "org.gamecult.eve.unity-scene": "file:../../packages/org.gamecult.eve.unity-scene", diff --git a/TestProject/Packages/packages-lock.json b/TestProject/Packages/packages-lock.json index 6b032e8..c270403 100644 --- a/TestProject/Packages/packages-lock.json +++ b/TestProject/Packages/packages-lock.json @@ -6,6 +6,13 @@ "source": "builtin", "dependencies": {} }, + "com.unity.mathematics": { + "version": "1.3.3", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.test-framework": { "version": "1.6.0", "depth": 0, @@ -17,7 +24,7 @@ } }, "org.gamecult.cultlib": { - "version": "file:../../../CultLib/artifacts/unity/org.gamecult.cultlib", + "version": "file:../../artifacts/test-dependencies/org.gamecult.cultlib", "depth": 0, "source": "local", "dependencies": {} @@ -33,7 +40,7 @@ "depth": 0, "source": "local", "dependencies": { - "org.gamecult.cultlib": "1.0.3" + "org.gamecult.cultlib": "1.0.8" } }, "org.gamecult.eve.unity-scene": { @@ -41,9 +48,10 @@ "depth": 0, "source": "local", "dependencies": { - "org.gamecult.cultlib": "1.0.3", + "org.gamecult.cultlib": "1.0.9", "org.gamecult.eve.plugin-fields": "0.1.1", - "org.gamecult.eve.surface": "0.1.0" + "org.gamecult.eve.surface": "0.2.0", + "com.unity.mathematics": "1.3.2" } }, "org.gamecult.eve.unity-uitoolkit": { diff --git a/scripts/run-package-tests.ps1 b/scripts/run-package-tests.ps1 index 1b2ff11..dbf3962 100644 --- a/scripts/run-package-tests.ps1 +++ b/scripts/run-package-tests.ps1 @@ -17,6 +17,18 @@ foreach ($required in @($UnityExe, $projectPath, $cultLibBuilder)) { powershell -ExecutionPolicy Bypass -File $cultLibBuilder if ($LASTEXITCODE -ne 0) { throw "CultLib Unity package build failed with exit code $LASTEXITCODE" } +$builtCultLibPackage = Join-Path $CultLibRoot "artifacts\unity\org.gamecult.cultlib" +$stagedDependenciesRoot = Join-Path $repoRoot "artifacts\test-dependencies" +$stagedCultLibPackage = Join-Path $stagedDependenciesRoot "org.gamecult.cultlib" +if (-not (Test-Path -LiteralPath $builtCultLibPackage)) { + throw "CultLib Unity package build did not produce: $builtCultLibPackage" +} +New-Item -ItemType Directory -Force -Path $stagedDependenciesRoot | Out-Null +if (Test-Path -LiteralPath $stagedCultLibPackage) { + [IO.Directory]::Delete($stagedCultLibPackage, $true) +} +Copy-Item -LiteralPath $builtCultLibPackage -Destination $stagedCultLibPackage -Recurse + $runRoot = Join-Path $output (Get-Date -Format "yyyyMMddTHHmmss") New-Item -ItemType Directory -Force -Path $runRoot | Out-Null $resultsPath = Join-Path $runRoot "unity-editmode-results.xml" @@ -40,3 +52,4 @@ if ($null -eq $run -or [int]$run.total -eq 0 -or [int]$run.failed -gt 0) { } Write-Host "EveUnity generic package tests: $($run.passed) passed, $($run.total) total" Write-Host "Consumer: $projectPath" +Write-Host "CultLib package: $stagedCultLibPackage"