Merge branch 'release/1.4.0'

abbgrade · Aug 7, 2022 · 1374c35 · 1374c35
2 parents 96bc751 + bf01d9c
commit 1374c35
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.4.0] - 2022-08-07
+
+### Added
+
+- Branch config for PowerShell matrix.
+
+### Fixed
+
+- Fixed PowerShell clean removed doc index and config.
+
 ## [1.3.0] - 2022-07-31
 
 ### Added

diff --git a/GitHub/build-validation-matrix.yml b/GitHub/build-validation-matrix.yml
@@ -6,4 +6,4 @@ on:
 
 jobs:
   build-validation:
-    uses: abbgrade/PsBuildTasks/.github/workflows/build-validation-matrix.yml@v1.1
+    uses: abbgrade/PsBuildTasks/.github/workflows/build-validation-matrix.yml@1.4.0
diff --git a/GitHub/build-validation-windows.yml b/GitHub/build-validation-windows.yml
@@ -6,4 +6,4 @@ on:
 
 jobs:
   build-validation:
-    uses: abbgrade/PsBuildTasks/.github/workflows/build-validation-windows.yml@v1.1
+    uses: abbgrade/PsBuildTasks/.github/workflows/build-validation-windows.yml@1.4.0
diff --git a/GitHub/pre-release-windows.yml b/GitHub/pre-release-windows.yml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   pre-release:
-    uses: abbgrade/PsBuildTasks/.github/workflows/pre-release-windows.yml@v1.1
+    uses: abbgrade/PsBuildTasks/.github/workflows/pre-release-windows.yml@1.4.0
     with:
       module-name: MyModuleName
     secrets:

diff --git a/GitHub/release-windows.yml b/GitHub/release-windows.yml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   release:
-    uses: abbgrade/PsBuildTasks/.github/workflows/release-windows.yml@v1.1
+    uses: abbgrade/PsBuildTasks/.github/workflows/release-windows.yml@1.4.0
     with:
       module-name: MyModuleName
     secrets:

diff --git a/Powershell/Build.Tasks.ps1 b/Powershell/Build.Tasks.ps1
@@ -8,7 +8,8 @@ requires ModuleName
 
 # Synopsis: Remove all temporary files.
 task Clean -Jobs {
-	remove $PublishDirectory, $DocumentationDirectory
+	remove $PublishDirectory
+	$DocumentationDirectory | Get-ChildItem -Exclude index.md, _config.yml | Remove-item
 }
 
 # Synopsis: Import the module.

diff --git a/tasks/PowerShell-Matrix.Tasks.ps1 b/tasks/PowerShell-Matrix.Tasks.ps1
@@ -1,8 +1,13 @@
+
+if ( -Not $PsBuildTaskBranch ) {
+    $PsBuildTaskBranch = 'main'
+}
+
 #region InvokeBuild
 
 task UpdateBuildTasks {
 	Invoke-WebRequest `
-		-Uri 'https://raw.githubusercontent.com/abbgrade/PsBuildTasks/main/Powershell/Build.Tasks.ps1' `
+		-Uri "https://raw.githubusercontent.com/abbgrade/PsBuildTasks/$PsBuildTaskBranch/Powershell/Build.Tasks.ps1" `
 		-OutFile "$PSScriptRoot\Build.Tasks.ps1"
 }
 
@@ -13,7 +18,7 @@ task UpdateValidationWorkflow {
     [System.IO.FileInfo] $file = "$PSScriptRoot/../.github/workflows/build-validation.yml"
     New-Item -Type Directory $file.Directory -ErrorAction SilentlyContinue
     Invoke-WebRequest `
-        -Uri 'https://raw.githubusercontent.com/abbgrade/PsBuildTasks/main/GitHub/build-validation-matrix.yml' `
+        -Uri "https://raw.githubusercontent.com/abbgrade/PsBuildTasks/$PsBuildTaskBranch/GitHub/build-validation-matrix.yml" `
         -OutFile $file
 }
 
@@ -22,7 +27,7 @@ task UpdatePreReleaseWorkflow {
     [System.IO.FileInfo] $file = "$PSScriptRoot\..\.github\workflows\pre-release.yml"
     New-Item -Type Directory $file.Directory -ErrorAction SilentlyContinue
     Invoke-WebRequest `
-        -Uri 'https://raw.githubusercontent.com/abbgrade/PsBuildTasks/main/GitHub/pre-release-windows.yml' |
+        -Uri "https://raw.githubusercontent.com/abbgrade/PsBuildTasks/$PsBuildTaskBranch/GitHub/pre-release-windows.yml" |
     ForEach-Object { $_ -replace 'MyModuleName', $ModuleName } |
     Out-File $file -NoNewline
 }
@@ -32,7 +37,7 @@ task UpdateReleaseWorkflow {
     [System.IO.FileInfo] $file = "$PSScriptRoot\..\.github\workflows\release.yml"
     New-Item -Type Directory $file.Directory -ErrorAction SilentlyContinue
     Invoke-WebRequest `
-        -Uri 'https://raw.githubusercontent.com/abbgrade/PsBuildTasks/main/GitHub/release-windows.yml' |
+        -Uri "https://raw.githubusercontent.com/abbgrade/PsBuildTasks/$PsBuildTaskBranch/GitHub/release-windows.yml" |
     ForEach-Object { $_ -replace 'MyModuleName', $ModuleName } |
     Out-File $file -NoNewline
 }
@@ -43,10 +48,10 @@ task UpdateReleaseWorkflow {
 task UpdateIndexPage {
     New-Item -Type Directory "$PSScriptRoot\..\docs" -ErrorAction SilentlyContinue
     Invoke-WebRequest `
-        -Uri 'https://raw.githubusercontent.com/abbgrade/PsBuildTasks/main/docs/index.md' `
+        -Uri "https://raw.githubusercontent.com/abbgrade/PsBuildTasks/$PsBuildTaskBranch/docs/index.md" `
         -OutFile "$PSScriptRoot\..\docs\index.md"
     Invoke-WebRequest `
-        -Uri 'https://raw.githubusercontent.com/abbgrade/PsBuildTasks/main/docs/_config.yml' `
+        -Uri "https://raw.githubusercontent.com/abbgrade/PsBuildTasks/$PsBuildTaskBranch/docs/_config.yml" `
         -OutFile "$PSScriptRoot\..\docs\_config.yml"
 }
 
@@ -55,7 +60,7 @@ task UpdateIndexPage {
 
 task UpdateVsCodeTasks {
     Invoke-WebRequest `
-        -Uri 'https://raw.githubusercontent.com/abbgrade/PsBuildTasks/main/VsCode/tasks.json' `
+        -Uri "https://raw.githubusercontent.com/abbgrade/PsBuildTasks/$PsBuildTaskBranch/VsCode/tasks.json" `
         -OutFile "$PSScriptRoot\..\.vscode\tasks.json"
 }
 
@@ -64,7 +69,7 @@ task UpdateVsCodeTasks {
 
 task UpdatePsBuildTasksTasks {
     Invoke-WebRequest `
-        -Uri 'https://raw.githubusercontent.com/abbgrade/PsBuildTasks/main/tasks/PowerShell-Matrix.Tasks.ps1' `
+        -Uri "https://raw.githubusercontent.com/abbgrade/PsBuildTasks/$PsBuildTaskBranch/tasks/PowerShell-Matrix.Tasks.ps1" `
         -OutFile "$PSScriptRoot\PsBuild.Tasks.ps1"
 }