Merge Correct paths for review upload job (mr-548)

1b6c1a6 - fix(ci): correct paths for review upload job
citizenfx · Oct 10, 2024 · 72c2081 · 72c2081
2 parents ec017ce + 1b6c1a6
commit 72c2081
Showing 1 changed file with 13 additions and 18 deletions.
diff --git a/code/tools/ci/upload_review.ps1 b/code/tools/ci/upload_review.ps1
@@ -4,45 +4,40 @@ $WorkDir = $env:CI_PROJECT_DIR -replace '/','\'
 $WorkRootDir = "$WorkDir\code"
 $CacheDir = "$WorkDir\caches"
 
-$OutName = "FxUpload-${env:CI_PIPELINE_ID}-${env:CI_JOB_ID}.zip"
+$PackFromRoot = "$env:TEMP\FxUpload-${env:CI_PIPELINE_ID}-${env:CI_JOB_ID}"
 
-$TempDir = "$env:TEMP\$OutName"
-$OutZip = "$TempDir\..\$OutName"
+$PackToName = "FxUpload-${env:CI_PIPELINE_ID}-${env:CI_JOB_NAME_SLUG}.zip"
+$PackToPath = "$env:TEMP\$PackToName"
 
-if (Test-Path $TempDir) {
-	Remove-Item -Force -Recurse $TempDir
-}
-
-if (Test-Path $OutZip) {
-	Remove-Item -Force $OutZip
-}
+Remove-Item -Force -Recurse -ErrorAction ignore $PackFromRoot
+Remove-Item -Force -ErrorAction ignore $PackToPath
 
-New-Item -Force -ItemType Directory $TempDir
-& "$WorkRootDir\tools\ci\7z.exe" x -y "-o$TempDir" "$CacheDir\CitizenFX.exe.xz"
+New-Item -Force -ItemType Directory $PackFromRoot
+& "$WorkRootDir\tools\ci\7z.exe" x -y "-o$PackFromRoot" "$CacheDir\CitizenFX.exe.xz"
 
 $items = (Get-ChildItem -Recurse -Path $CacheDir)
 
 foreach ($item in $items) {
 	if (Test-Path $Item.FullName -NewerThan 1/1/2020) {
 		if ($item.Name.EndsWith(".dll.xz") -or $item.Name.EndsWith(".exe.xz") -or $item.Name.EndsWith(".bin.xz")) {
-			& $WorkRootDir\tools\ci\7z.exe x -y "-o$TempDir" $item.FullName
+			& $WorkRootDir\tools\ci\7z.exe x -y "-o$PackFromRoot" $item.FullName
 		} elseif ($item.Name.EndsWith(".dll") -or $item.Name.EndsWith(".exe") -or $item.Name.EndsWith(".bin")) {
-			Copy-Item -Force -Path $item.FullName -Destination $TempDir
+			Copy-Item -Force -Path $item.FullName -Destination $PackFromRoot
 		}
 	}
 }
 
-& "$WorkRootDir\tools\ci\7z.exe" a -mx=5 $OutZip $TempDir
+& "$WorkRootDir\tools\ci\7z.exe" a -mx=5 $PackToPath $PackFromRoot
 
 if ($env:CFX_DRY_RUN -eq "true") {
 	Write-Output "DRY RUN: Would upload review"
 } else {
-	& "curl.exe" -T $OutZip "${env:REVIEW_UPLOAD_URL}/$OutName"
+	& "curl.exe" --fail-with-body -T $PackToPath "${env:REVIEW_UPLOAD_URL}/$PackToName"
 	if ($LASTEXITCODE -ne 0) {
 		Write-Host "Failed to upload review"
 		Exit 1
 	}
 }
 
-Remove-Item -Force -Recurse $TempDir
-Remove-Item -Force $OutZip
+Remove-Item -Force -Recurse $PackFromRoot
+Remove-Item -Force $PackToPath