Merge branch 'dev'

Author: joeltimothyoh

azure-pipelines.yml

@@ -17,12 +17,12 @@ resources:
     type: github
     name: theohbrothers/PSModulePublisher
     endpoint: startersclan                   # Check for your 'Type: Github' connection under 'Project Settings' > 'Service connections'
-    ref: refs/tags/v0.2.1
+    ref: refs/tags/v0.3.2
   - repository: PSRepositoryReleaseManager
     type: github
     name: theohbrothers/PSRepositoryReleaseManager
     endpoint: startersclan
-    ref: refs/tags/v0.3.0
+    ref: refs/tags/v0.4.4
 
 stages:
 - stage: build_test
@@ -35,11 +35,11 @@ stages:
     steps:
     - checkout: self
       submodules: recursive
-    - template: templates/azure-pipelines/windows/pwsh/continuous-build.yml@PSModulePublisher
+    - template: templates/azure-pipelines/entrypoint/windows/continuous-build.yml@PSModulePublisher
   - job: linux_container
     displayName: '[Linux] [Container] PowerShell'
     pool:
-      vmImage: ubuntu-16.04
+      vmImage: ubuntu-18.04
     strategy:
       matrix:
         6.2.0:
@@ -50,23 +50,23 @@ stages:
     steps:
     - checkout: self
       submodules: recursive
-    - template: templates/azure-pipelines/linux/continuous-build.yml@PSModulePublisher
+    - template: templates/azure-pipelines/entrypoint/linux/continuous-build.yml@PSModulePublisher
   - job: windows_powershell_5_1
     displayName: '[Windows] PowerShell 5.1'
     pool:
       vmImage: windows-2019
     steps:
     - checkout: self
       submodules: recursive
-    - template: templates/azure-pipelines/windows/powershell/continuous-build.yml@PSModulePublisher
+    - template: templates/azure-pipelines/entrypoint/windows/powershell/continuous-build.yml@PSModulePublisher
   - job: windows_powershell_5_0
     displayName: '[Windows] PowerShell 5.0'
     pool:
       vmImage: vs2015-win2012r2
     steps:
     - checkout: self
       submodules: recursive
-    - template: templates/azure-pipelines/windows/powershell/continuous-build.yml@PSModulePublisher
+    - template: templates/azure-pipelines/entrypoint/windows/powershell/continuous-build.yml@PSModulePublisher
 - stage: publish
   displayName: Publish
   dependsOn: build_test
@@ -78,18 +78,19 @@ stages:
     steps:
     - checkout: self
       submodules: recursive
-    - template: templates/azure-pipelines/windows/pwsh/continuous-build.yml@PSModulePublisher
-    - template: templates/azure-pipelines/windows/pwsh/publish.yml@PSModulePublisher
+    - template: templates/azure-pipelines/entrypoint/windows/continuous-build.yml@PSModulePublisher
+    - template: templates/azure-pipelines/entrypoint/windows/publish.yml@PSModulePublisher
 - stage: release
   displayName: Release
   dependsOn: publish
   jobs:
   - job: linux_container
-    displayName: '[Linux] [Container]'
+    displayName: '[Linux] [Container] PowerShell Core'
     pool:
-      vmImage: ubuntu-16.04
-    container: joeltimothyoh/powershell:6.1.0-ubuntu-18.04-git-sudo
+      vmImage: ubuntu-18.04
+    container: joeltimothyoh/powershell:6.1.0-ubuntu-18.04-git
     steps:
     - checkout: self
       submodules: recursive
-    - template: templates/azure-pipelines/pwsh/release.yml@PSRepositoryReleaseManager
+    - template: templates/azure-pipelines/entrypoint/generate.yml@PSRepositoryReleaseManager
+    - template: templates/azure-pipelines/entrypoint/release.yml@PSRepositoryReleaseManager

build/PSModulePublisher

@@ -16,34 +16,34 @@ try {
     }
     Get-Module Pester -ListAvailable
 
-    Set-StrictMode -Off
-    if ($IsLinux) {
-        "Installing dependencies for linux" | Write-Host
+    if ($env:OS -ne 'Windows_NT') {
+        if ($IsLinux) {
+            "Installing dependencies for linux" | Write-Host
 
-        # Provisioning script block
-        $provisionScriptBlock = {
-            $sudo = sh -c 'command -v sudo'
-            $shellBin = sh -c 'command -v bash || command -v sh'
-            $sudo | Write-Host
-            $shellBin | Write-Host
-            "Shell command:" | Write-Verbose
-            $script:shellArgs | Write-Verbose
-            if ($sudo) {
-                'Executing command with sudo' | Write-Host
-                & $sudo $shellBin @script:shellArgs | Write-Host
-            }else {
-                & $shellBin @script:shellArgs | Write-Host
+            # Provisioning script block
+            $provisionScriptBlock = {
+                $sudo = sh -c 'command -v sudo'
+                $shellBin = sh -c 'command -v bash || command -v sh'
+                $sudo | Write-Host
+                $shellBin | Write-Host
+                "Shell command:" | Write-Verbose
+                $script:shellArgs | Write-Verbose
+                if ($sudo) {
+                    'Executing command with sudo' | Write-Host
+                    & $sudo $shellBin @script:shellArgs | Write-Host
+                }else {
+                    & $shellBin @script:shellArgs | Write-Host
+                }
+                if ($LASTEXITCODE) { throw "An error occurred." }
             }
-            if ($LASTEXITCODE) { throw "An error occurred." }
-        }
 
-        # Install linux dependencies
-        $shellArgs = @(
-            'linux/sourcepawn-dependencies.sh'
-        )
-        & $provisionScriptBlock
+            # Install linux dependencies
+            $shellArgs = @(
+                'linux/sourcepawn-dependencies.sh'
+            )
+            & $provisionScriptBlock
+        }
     }
-    Set-StrictMode -Version Latest
 
 }catch {
     throw

build/PSRepositoryReleaseManager

@@ -6,16 +6,24 @@ $VerbosePreference = 'Continue'
 
 $failedCount = 0
 
-"Function: Compile-SourceScript" | Write-Host
 $functionTestScriptBlock = {
     try {
-        Compile-SourceScript @cmdArgs
+        "Command: $script:cmd" | Write-Verbose
+        "Args:" | Write-Verbose
+        $script:cmdArgs | Out-String -Stream | % { $_.Trim() } | ? { $_ } | Write-Verbose
+        for ($i=0; $i -le $iterations-1; $i++) {
+            "Iteration: $($i+1)" | Write-Host
+            & $script:cmd @cmdArgs
+        }
     }catch {
         $_ | Write-Error
         $script:failedCount++
     }
 }
 
+# Function: Compile-SourceScript
+$cmd = "Compile-SourceScript"
+
 #############
 # SourceMod #
 #############
@@ -25,8 +33,8 @@ $cmdArgs = @{
     File = "$PSScriptRoot\..\..\mod\sourcemod\addons\sourcemod\scripting\plugin1.sp"
     Force = $true
 }
-$cmdArgs | Out-String -Stream | % { $_.Trim() } | ? { $_ } | Write-Verbose
-1..2 | % { "Iteration: $_" | Write-Host; & $functionTestScriptBlock }
+$iterations = 2
+& $functionTestScriptBlock
 
 
 "`n[sourcemod] Compile plugin via compiler" | Write-Host
@@ -35,8 +43,8 @@ $cmdArgs = @{
     Force = $true
     SkipWrapper = $true
 }
-$cmdArgs | Out-String -Stream | % { $_.Trim() } | ? { $_ } | Write-Verbose
-1..2 | % { "Iteration: $_" | Write-Host; & $functionTestScriptBlock }
+$iterations = 2
+& $functionTestScriptBlock
 
 
 #############
@@ -52,8 +60,8 @@ if ($env:OS) {
         File = "$PSScriptRoot\..\..\mod\amxmodx\addons\amxmodx\scripting\plugin1.sma"
         Force = $true
     }
-    $cmdArgs | Out-String -Stream | % { $_.Trim() } | ? { $_ } | Write-Verbose
-    1..2 | % { "Iteration: $_" | Write-Host; & $functionTestScriptBlock }
+    $iterations = 2
+    & $functionTestScriptBlock
 }else { "Skipping: Test only applicable to Windows." | Write-Host }
 
 "`n[amxmodx] Compile plugin via compiler" | Write-Host
@@ -62,8 +70,8 @@ $cmdArgs = @{
     Force = $true
     SkipWrapper = $true
 }
-$cmdArgs | Out-String -Stream | % { $_.Trim() } | ? { $_ } | Write-Verbose
-1..2 | % { "Iteration: $_" | Write-Host; & $functionTestScriptBlock }
+$iterations = 2
+& $functionTestScriptBlock
 
 
 ###########

test/scripts/dep/Install-TestDependencies.ps1

@@ -6,6 +6,8 @@ $VerbosePreference = 'Continue'
 $global:PesterDebugPreference_ShowFullErrors = $true
 
 try {
+    Push-Location $PSScriptRoot
+
     # Install test dependencies
     "Installing test dependencies" | Write-Host
     & "$PSScriptRoot\scripts\dep\Install-TestDependencies.ps1" > $null
@@ -27,12 +29,14 @@ try {
     }
 
     "Listing test artifacts" | Write-Host
-    git ls-files --others --exclude-standard $PSScriptRoot
+    git ls-files --others --exclude-standard
 
     "End of tests" | Write-Host
     if ($testFailed) {
         throw "One or more tests failed."
     }
 }catch {
     throw
+}finally {
+    Pop-Location
 }