Skip to content

Commit ffeb2c7

Browse files
authored
Fix CI module versioning (#8)
- Fix CI module versioning - Install PSRule module before versioning
1 parent 956adad commit ffeb2c7

2 files changed

Lines changed: 17 additions & 3 deletions

File tree

pipeline.build.ps1

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ param (
2121
[String]$ArtifactPath = (Join-Path -Path $PWD -ChildPath out/modules)
2222
)
2323

24+
if ($Env:SYSTEM_DEBUG -eq 'true') {
25+
$VerbosePreference = 'Continue';
26+
}
27+
2428
if ($Env:Coverage -eq 'true') {
2529
$CodeCoverage = $True;
2630
}
@@ -55,7 +59,7 @@ function CopyModuleFiles {
5559
}
5660
}
5761

58-
task VersionModule {
62+
task VersionModule PSRule, {
5963
if (![String]::IsNullOrEmpty($ReleaseVersion)) {
6064
Write-Verbose -Message "[VersionModule] -- ReleaseVersion: $ReleaseVersion";
6165
$ModuleVersion = $ReleaseVersion;
@@ -68,7 +72,6 @@ task VersionModule {
6872
$revision = [String]::Empty;
6973

7074
Write-Verbose -Message "[VersionModule] -- Using Version: $version";
71-
Write-Verbose -Message "[VersionModule] -- Using Revision: $revision";
7275

7376
if ($version -like '*-*') {
7477
[String[]]$versionParts = $version.Split('-', [System.StringSplitOptions]::RemoveEmptyEntries);
@@ -77,6 +80,8 @@ task VersionModule {
7780
if ($versionParts.Length -eq 2) {
7881
$revision = $versionParts[1];
7982
}
83+
84+
Write-Verbose -Message "[VersionModule] -- Using Revision: $revision";
8085
}
8186

8287
# Update module version
@@ -179,7 +184,7 @@ task Clean {
179184
Remove-Item -Path out,reports -Recurse -Force -ErrorAction SilentlyContinue;
180185
}
181186

182-
task Build Clean, BuildModule
187+
task Build Clean, BuildModule, VersionModule
183188

184189
task Test Build, TestRules
185190

scripts/pipeline-build.ps1

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,19 @@ param (
3030
[String]$ArtifactPath
3131
)
3232

33+
if ($Env:SYSTEM_DEBUG -eq 'true') {
34+
$VerbosePreference = 'Continue';
35+
}
36+
3337
if ($Null -eq (Get-PackageProvider -Name NuGet -ErrorAction Ignore)) {
3438
Install-PackageProvider -Name NuGet -Force -Scope CurrentUser;
3539
}
3640

41+
if ($Null -eq (Get-InstalledModule -Name PowerShellGet -MinimumVersion 2.1.2 -ErrorAction Ignore)) {
42+
Install-Module PowerShellGet -MinimumVersion 2.1.2 -Scope CurrentUser -Force -AllowClobber;
43+
Import-Module PowerShellGet -MinimumVersion 2.1.2 -Force;
44+
}
45+
3746
if ($Null -eq (Get-InstalledModule -Name InvokeBuild -MinimumVersion 5.4.0 -ErrorAction Ignore)) {
3847
Install-Module InvokeBuild -MinimumVersion 5.4.0 -Scope CurrentUser -Force;
3948
}

0 commit comments

Comments
 (0)