Merge pull request #326 from AArnott/azpPurify

Move variable definition script
dotnet · Dec 24, 2024 · e833efe · e833efe
2 parents 709bc0e + fe7350f
commit e833efe
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -43,7 +43,7 @@ jobs:
         }
       shell: pwsh
     - name: ⚙️ Set pipeline variables based on source
-      run: azure-pipelines/define_variables.ps1
+      run: tools/variables/_define.ps1
       shell: pwsh
     - name: 🛠 build
       run: dotnet build -t:build,pack --no-restore -c ${{ env.BUILDCONFIGURATION }} -warnAsError -warnNotAsError:NU1901,NU1902,NU1903,NU1904 /bl:"${{ runner.temp }}/_artifacts/build_logs/build.binlog"
@@ -58,7 +58,7 @@ jobs:
       run: dotnet docfx docfx/docfx.json --warningsAsErrors --disableGitFeatures
       if: runner.os == 'Linux'
     - name: ⚙ Update pipeline variables based on build outputs
-      run: azure-pipelines/define_variables.ps1
+      run: tools/variables/_define.ps1
       shell: pwsh
     - name: 📢 Publish artifacts
       uses: ./.github/actions/publish-artifacts

diff --git a/azure-pipelines/dotnet.yml b/azure-pipelines/dotnet.yml
@@ -10,7 +10,7 @@ steps:
   displayName: 🧪 dotnet test
   condition: and(succeeded(), ${{ parameters.RunTests }})
 
-- powershell: azure-pipelines/define_variables.ps1
+- powershell: tools/variables/_define.ps1
   failOnStderr: true
   displayName: ⚙ Update pipeline variables based on build outputs
   condition: succeededOrFailed()

diff --git a/azure-pipelines/install-dependencies.yml b/azure-pipelines/install-dependencies.yml
@@ -19,7 +19,7 @@ steps:
     }
   displayName: ⚙ Install prerequisites
 
-- powershell: azure-pipelines/define_variables.ps1
+- powershell: tools/variables/_define.ps1
   failOnStderr: true
   displayName: ⚙ Set pipeline variables based on source
   name: SetPipelineVariables
diff --git a/azure-pipelines/define_variables.ps1 → tools/variables/_define.ps1 b/azure-pipelines/define_variables.ps1 → tools/variables/_define.ps1
@@ -11,7 +11,7 @@
 param (
 )
 
-(& "$PSScriptRoot\..\tools\variables\_all.ps1").GetEnumerator() |% {
+(& "$PSScriptRoot\_all.ps1").GetEnumerator() |% {
     # Always use ALL CAPS for env var names since Azure Pipelines converts variable names to all caps and on non-Windows OS, env vars are case sensitive.
     $keyCaps = $_.Key.ToUpper()
     if ((Test-Path "env:$keyCaps") -and (Get-Content "env:$keyCaps")) {