Set locale correctly on Linux CI (#16073)

daxian-dbw · adityapatwardhan · commit 72c8c9b24ab4 · 2021-09-15T11:12:33.000-07:00
diff --git a/.vsts-ci/linux-daily.yml b/.vsts-ci/linux-daily.yml
@@ -122,19 +122,13 @@ stages:
       condition: succeededOrFailed()
 
     - pwsh: |
-        Import-Module .\build.psm1
-        Set-CorrectLocale
-
         Import-Module .\tools\ci.psm1
         Restore-PSOptions -PSOptionsPath '$(System.ArtifactsDirectory)\build\psoptions.json'
         Invoke-CITest -Purpose UnelevatedPesterTests -TagSet Others
       displayName: Test - UnelevatedPesterTests - Others
       condition: succeededOrFailed()
 
     - pwsh: |
-        Import-Module .\build.psm1
-        Set-CorrectLocale
-
         Import-Module .\tools\ci.psm1
         Restore-PSOptions -PSOptionsPath '$(System.ArtifactsDirectory)\build\psoptions.json'
         Invoke-CITest -Purpose ElevatedPesterTests -TagSet Others
diff --git a/.vsts-ci/templates/nix-test.yml b/.vsts-ci/templates/nix-test.yml
@@ -63,9 +63,6 @@ jobs:
     continueOnError: true
 
   - pwsh: |
-      Import-Module .\build.psm1 -Force
-      Set-CorrectLocale
-
       Import-Module .\tools\ci.psm1
       Restore-PSOptions -PSOptionsPath '$(System.ArtifactsDirectory)\build\psoptions.json'
       $options = (Get-PSOptions)
diff --git a/tools/ci.psm1 b/tools/ci.psm1
@@ -215,6 +215,9 @@ function Invoke-CITest
         [string] $TagSet
     )
 
+    # Set locale correctly for Linux CIs
+    Set-CorrectLocale
+
     # Pester doesn't allow Invoke-Pester -TagAll@('CI', 'RequireAdminOnWindows') currently
     # https://github.com/pester/Pester/issues/608
     # To work-around it, we exlude all categories, but 'CI' from the list

Original file line number	Diff line number	Diff line change
`@@ -215,6 +215,9 @@ function Invoke-CITest`
`215`	`215`	`[string] $TagSet`
`216`	`216`	`)`
`217`	`217`
	`218`	`+ # Set locale correctly for Linux CIs`
	`219`	`+ Set-CorrectLocale`
	`220`	`+`
`218`	`221`	`# Pester doesn't allow Invoke-Pester -TagAll@('CI', 'RequireAdminOnWindows') currently`
`219`	`222`	`# https://github.com/pester/Pester/issues/608`
`220`	`223`	`# To work-around it, we exlude all categories, but 'CI' from the list`