From e0de6637f0849a4333747eb2d074b4679918fca6 Mon Sep 17 00:00:00 2001 From: Jonathan Medd Date: Mon, 14 Jun 2021 15:16:38 +0100 Subject: [PATCH 1/2] Set fixed module versions --- tools/build.ps1 | 13 ++++++++++--- tools/build.psake.ps1 | 5 +++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/tools/build.ps1 b/tools/build.ps1 index 54f4e74a..3ab4de70 100644 --- a/tools/build.ps1 +++ b/tools/build.ps1 @@ -46,11 +46,11 @@ $Requirements = @( }, @{ Name = "BuildHelpers" - Version = "2.0.15" + Version = "2.0.16" }, @{ Name = "Pester" - Version = "5.1.1" + Version = "5.2.1" }, @{ Name = "platyPS" @@ -71,11 +71,19 @@ foreach ($RequiredModule in $Requirements) { $InstalledModule = Get-Module -Name $RequiredModule.Name -ListAvailable + # Update module if installed version is lower than required version if ($InstalledModule -and ($InstalledModule[0].Version -lt [Version]$RequiredModule.Version)) { Write-Host " -> Updating $($RequiredModule.Name)" Update-Module @ModuleParams } + # Install module if installed version is greater than required version + if ($InstalledModule -and ($InstalledModule[0].Version -gt [Version]$RequiredModule.Version)) { + Write-Host " -> Installing required version of $($RequiredModule.Name)" + Install-Module @ModuleParams + } + + # Install module if not present if (!$InstalledModule) { Write-Host " -> Installing $($RequiredModule.Name)" Install-Module @ModuleParams @@ -90,7 +98,6 @@ Set-BuildEnvironment -Force # --- Set Psake parameters $PsakeBuildParameters = @{ BuildFile = "$($PSScriptRoot)\build.psake.ps1" - TaskList = $Task Nologo = $true } diff --git a/tools/build.psake.ps1 b/tools/build.psake.ps1 index fbda9658..8171a3af 100644 --- a/tools/build.psake.ps1 +++ b/tools/build.psake.ps1 @@ -1,4 +1,9 @@ using namespace System.Management.Automation.Language +#Requires -Modules @{ModuleName="PSake"; RequiredVersion="4.9.0"},@{ModuleName="PSScriptAnalyzer"; RequiredVersion="1.19.1"},@{ModuleName="BuildHelpers"; RequiredVersion="2.0.16"} +#Requires -Modules @{ModuleName="Pester"; RequiredVersion="5.2.1"},@{ModuleName="platyPS"; RequiredVersion="0.14.1"} + +Write-Host "Module versions are:" +Get-Module -Name Psake,PSScriptAnalyzer,BuildHelpers,Pester,platyPS # --- Dot source build.settings.ps1 . $PSScriptRoot\build.settings.ps1 From e03e7b204a6723e7bc86e567e968118346f239d4 Mon Sep 17 00:00:00 2001 From: Jonathan Medd Date: Mon, 14 Jun 2021 15:59:05 +0100 Subject: [PATCH 2/2] Test gitversion 5.6.9 --- .github/workflows/ps-module.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ps-module.yml b/.github/workflows/ps-module.yml index 0efee519..619f6f3e 100644 --- a/.github/workflows/ps-module.yml +++ b/.github/workflows/ps-module.yml @@ -30,7 +30,7 @@ jobs: - name: Install GitVersion uses: gittools/actions/gitversion/setup@v0.9.8 with: - versionSpec: '5.x' + versionSpec: '5.6.9' - name: Determine Version id: gitversion