Skip to content

Commit c59ff90

Browse files
committed
Merge branch 'hotfix/1.7.2'
2 parents 76bc5c6 + a1e19ee commit c59ff90

8 files changed

Lines changed: 46 additions & 12 deletions

File tree

.github/workflows/build-validation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ on:
66

77
jobs:
88
build-validation:
9-
uses: abbgrade/PsBuildTasks/.github/workflows/build-validation-matrix.yml@1.11.1
9+
uses: abbgrade/PsBuildTasks/.github/workflows/build-validation-matrix.yml@1.14.5

.github/workflows/pre-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
on:
22
push:
3-
branches: [ release/*, 'hotfix/*' ]
3+
branches: [ release/* ]
44
workflow_dispatch:
55

66
jobs:
77
pre-release:
8-
uses: abbgrade/PsBuildTasks/.github/workflows/pre-release-windows.yml@1.11.1
8+
uses: abbgrade/PsBuildTasks/.github/workflows/pre-release-windows.yml@1.14.5
99
with:
1010
module-name: PsSqlTestServer
1111
secrets:
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
on:
2+
push:
3+
branches: [ 'hotfix/*' ]
4+
workflow_dispatch:
5+
6+
jobs:
7+
release:
8+
uses: abbgrade/PsBuildTasks/.github/workflows/release-windows.yml@1.14.5
9+
with:
10+
module-name: PsSqlTestServer
11+
force-publish: true
12+
secrets:
13+
ps-gallery-key: ${{ secrets.PS_GALLERY_KEY }}

.github/workflows/release.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ on:
55

66
jobs:
77
release:
8-
uses: abbgrade/PsBuildTasks/.github/workflows/release-windows.yml@1.11.1
8+
uses: abbgrade/PsBuildTasks/.github/workflows/release-windows.yml@1.14.5
99
with:
1010
module-name: PsSqlTestServer
11+
force-publish: false
1112
secrets:
1213
ps-gallery-key: ${{ secrets.PS_GALLERY_KEY }}

CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [1.7.2] - 2026-01-02
11+
12+
### Changed
13+
14+
- Changed dependency to RequiredVersion.
15+
1016
## [1.7.1] - 2025-12-18
1117

1218
### Changed
@@ -24,6 +30,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2430
- Added new command `Get-AzureInstance` that works like `New-AzureInstance` but does not create new resources but reuses existing.
2531
- Added new parameter set to `New-AzureDatabase` that creates a server and extended `Remove-AzureDatabase` to clean up that created server.
2632

33+
## [1.6.1] - 2026-01-02
34+
35+
### Changed
36+
37+
- Set dependency to required version.
38+
2739
## [1.6.0] - 2023-03-07
2840

2941
### Added

src/PsSqlTestServer.psd1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
RootModule = 'PsSqlTestServer.psm1'
1313

1414
# Version number of this module.
15-
ModuleVersion = '1.7.1'
15+
ModuleVersion = '1.7.2'
1616

1717
# Supported PSEditions
1818
# CompatiblePSEditions = @()
@@ -51,7 +51,7 @@ Description = 'Cmdlets to provide and manage SQL servers for tests.'
5151
# ProcessorArchitecture = ''
5252

5353
# Modules that must be imported into the global environment prior to importing this module
54-
RequiredModules = @(@{ ModuleName = 'PsSqlClient'; ModuleVersion = '2.3.1' })
54+
RequiredModules = @(@{ ModuleName = 'PsSqlClient'; RequiredVersion = '2.3.1' })
5555

5656
# Assemblies that must be loaded prior to importing this module
5757
# RequiredAssemblies = @()

tasks/Dependencies.Tasks.ps1

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1-
task InstallBuildDependencies -Jobs {
1+
task InstallBuildDependencies -Jobs InstallReleaseDependencies, {
22
Install-Module platyPs -Scope CurrentUser -ErrorAction Stop -Verbose
3-
Install-Module PsSqlClient -Scope CurrentUser -ErrorAction Stop -Verbose -AllowPrerelease:$AllowPrerelease -AllowClobber
43
}
54

6-
task InstallTestDependencies -Jobs {
5+
task InstallTestDependencies -Jobs InstallReleaseDependencies, {
76
Install-Module psdocker -Scope CurrentUser -ErrorAction Stop -Verbose -AllowPrerelease:$AllowPrerelease
87
Install-Module PsSqlLocalDb -Scope CurrentUser -MinimumVersion 0.3 -ErrorAction Stop -Verbose -AllowPrerelease:$AllowPrerelease
9-
Install-Module PsSqlClient -Scope CurrentUser -ErrorAction Stop -Verbose -AllowPrerelease:$AllowPrerelease -AllowClobber
108
}
119

1210
task InstallReleaseDependencies -Jobs {
13-
Install-Module PsSqlClient -Scope CurrentUser -ErrorAction Stop -Verbose -AllowPrerelease:$AllowPrerelease -AllowClobber
11+
Install-Module PsSqlClient -Scope CurrentUser -RequiredVersion 1.5.0 -ErrorAction Stop -Verbose -AllowPrerelease:$AllowPrerelease -AllowClobber
1412
}

tasks/PsBuild.Tasks.ps1

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,17 @@ task UpdateReleaseWorkflow {
5050
Out-File $file -NoNewline
5151
}
5252

53-
task UpdateWorkflows -Jobs UpdateValidationWorkflow, UpdatePagesWorkflow, UpdatePreReleaseWorkflow, UpdateReleaseWorkflow
53+
task UpdateReleaseHotfixWorkflow {
54+
requires ModuleName
55+
[System.IO.FileInfo] $file = "$PSScriptRoot\..\.github\workflows\release-hotfix.yml"
56+
New-Item -Type Directory $file.Directory -ErrorAction SilentlyContinue
57+
Invoke-WebRequest `
58+
-Uri "https://raw.githubusercontent.com/abbgrade/PsBuildTasks/$PsBuildTaskBranch/GitHub/release-hotfix-windows.yml" |
59+
ForEach-Object { $_ -replace 'MyModuleName', $ModuleName } |
60+
Out-File $file -NoNewline
61+
}
62+
63+
task UpdateWorkflows -Jobs UpdateValidationWorkflow, UpdatePagesWorkflow, UpdatePreReleaseWorkflow, UpdateReleaseWorkflow, UpdateReleaseHotfixWorkflow
5464

5565
#endregion
5666
#region GitHub Pages

0 commit comments

Comments
 (0)