From 55bbf5d14a98390e32c3830d75fc2d9247b64580 Mon Sep 17 00:00:00 2001
From: insomnious <simon.davies@nexusmods.com>
Date: Thu, 25 Jan 2024 16:17:25 +0000
Subject: [PATCH] updated secrets

---
 .github/workflows/package.yml | 13 +++++++------
 .github/workflows/test.yml    | 21 +++++++++++++++------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index 36037c264..7d4d72c0b 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -182,9 +182,10 @@ jobs:
           $tempFolderName = "EPIC_TEMP"
           $tempFolder = Join-Path $rootDir $tempFolderName
           $buildFolder = Join-Path $rootDir "dist\win-unpacked"
+          $timestamp = Get-Date -Format "yyyyMMdd_HHmmss"
 
           $executableName = "Vortex.exe"
-          $buildVersionString = "${{ steps.setOutputs.outputs.epicBuildString }}"
+          $buildVersionString = "${{ steps.setOutputs.outputs.rawVersion }}+${timestamp}"
           
           Write-Output "rootDir $rootDir"
           Write-Output "extractFolder $extractFolder"
@@ -200,11 +201,11 @@ jobs:
           }
 
           & $binaryPath -mode="UploadBinary" `
-          -OrganizationId="$EPIC_ORGID" `
-          -ProductId="$EPIC_PRODUCTID" `
-          -ArtifactId="$EPIC_ARTIFACTID" `
-          -ClientId="$EPIC_CLIENTID" `
-          -ClientSecret="$EPIC_CLIENTSECRET" `
+          -OrganizationId="$env:EPIC_ORGID" `
+          -ProductId="$env:EPIC_PRODUCTID" `
+          -ArtifactId="$env:EPIC_ARTIFACTID" `
+          -ClientId="$env:EPIC_CLIENTID" `
+          -ClientSecret="$env:EPIC_CLIENTSECRET" `
           -CloudDir="$tempFolder" `
           -BuildRoot="$buildFolder" `
           -BuildVersion="$buildVersionString"  `
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d0bb9d43d..8a355587d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -84,6 +84,14 @@ jobs:
         with:
           submodules: "recursive"
 
+      - name: Create Temp Unpacked Folder
+        id: create-temp-folder
+        shell: pwsh
+        run: |
+          $rootDir = Resolve-Path "."
+          $buildFolder = Join-Path $rootDir "dist\win-unpacked"
+          New-Item -Path $buildFolder -Type Directory -Force        
+
       - name: Download BuildPatchTool
         id: buildpatch
         shell: pwsh
@@ -101,9 +109,10 @@ jobs:
           $tempFolderName = "EPIC_TEMP"
           $tempFolder = Join-Path $rootDir $tempFolderName
           $buildFolder = Join-Path $rootDir "dist\win-unpacked"
+          $timestamp = Get-Date -Format "yyyyMMdd_HHmmss"
 
           $executableName = "Vortex.exe"
-          $buildVersionString = "${{ steps.setOutputs.outputs.epicBuildString }}"
+          $buildVersionString = "${{ steps.setOutputs.outputs.rawVersion }}+${timestamp}"
           
           Write-Output "rootDir $rootDir"
           Write-Output "extractFolder $extractFolder"
@@ -119,11 +128,11 @@ jobs:
           }
 
           & $binaryPath -mode="UploadBinary" `
-          -OrganizationId="$EPIC_ORGID" `
-          -ProductId="$EPIC_PRODUCTID" `
-          -ArtifactId="$EPIC_ARTIFACTID" `
-          -ClientId="$EPIC_CLIENTID" `
-          -ClientSecret="$EPIC_CLIENTSECRET" `
+          -OrganizationId="$env:EPIC_ORGID" `
+          -ProductId="$env:EPIC_PRODUCTID" `
+          -ArtifactId="$env:EPIC_ARTIFACTID" `
+          -ClientId="$env:EPIC_CLIENTID" `
+          -ClientSecret="$env:EPIC_CLIENTSECRET" `
           -CloudDir="$tempFolder" `
           -BuildRoot="$buildFolder" `
           -BuildVersion="$buildVersionString"  `