Skip to content

Commit 9af8385

Browse files
kmaranionjckmaranionjc
authored
FTA/PTA 2.6.1 (#107)
* rerun * test * powershellget dependency * test * changelog test * test * fix * test * manual version * test * manual release * manual test * fix test * CI Dependencies
1 parent bd50061 commit 9af8385

File tree

9 files changed

+53
-22
lines changed

9 files changed

+53
-22
lines changed

‎.github/workflows/admu-ci.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,12 @@ jobs:
101101
if ($($PSDependencies[$RequiredModule].RequiredVersion) -eq "latest"){
102102
Install-Module -Name $RequiredModule -Repository:($($PSDependencies[$RequiredModule].Repository))-Force
103103
} else {
104-
Install-Module -Name $RequiredModule -Repository:($($PSDependencies[$RequiredModule].Repository)) -RequiredVersion:($($PSDependencies[$RequiredModule].RequiredVersion)) -AllowPrerelease -Force
104+
if($RequiredModule -eq 'PowerShellGet'){
105+
Install-Module -Name $RequiredModule -Repository:($($PSDependencies[$RequiredModule].Repository)) -RequiredVersion:($($PSDependencies[$RequiredModule].RequiredVersion)) -AllowPrerelease -Force -allowClobber
106+
} else {
107+
Install-Module -Name $RequiredModule -Repository:($($PSDependencies[$RequiredModule].Repository)) -RequiredVersion:($($PSDependencies[$RequiredModule].RequiredVersion)) -AllowPrerelease -Force
108+
}
109+
105110
}
106111
}
107112
}

‎.github/workflows/admu-release.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,11 @@ jobs:
9191
if ($($PSDependencies[$RequiredModule].RequiredVersion) -eq "latest"){
9292
Install-Module -Name $RequiredModule -Repository:($($PSDependencies[$RequiredModule].Repository))-Force
9393
} else {
94-
Install-Module -Name $RequiredModule -Repository:($($PSDependencies[$RequiredModule].Repository)) -RequiredVersion:($($PSDependencies[$RequiredModule].RequiredVersion)) -AllowPrerelease -Force
94+
if($RequiredModule -eq 'PowerShellGet'){
95+
Install-Module -Name $RequiredModule -Repository:($($PSDependencies[$RequiredModule].Repository)) -RequiredVersion:($($PSDependencies[$RequiredModule].RequiredVersion)) -AllowPrerelease -Force -allowClobber
96+
} else {
97+
Install-Module -Name $RequiredModule -Repository:($($PSDependencies[$RequiredModule].Repository)) -RequiredVersion:($($PSDependencies[$RequiredModule].RequiredVersion)) -AllowPrerelease -Force
98+
}
9599
}
96100
}
97101
}

‎Deploy/Build-Module.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,15 @@ If (-not $ADMUGetConfig) {
1717
###########################################################################
1818
# Region Checking PowerShell Gallery module version
1919
Write-Host ('[status]Check PowerShell Gallery for module version info')
20-
$PSGalleryInfo = Get-PSGalleryModuleVersion -Name:($ModuleName) -ReleaseType:($RELEASETYPE) #('Major', 'Minor', 'Patch')
20+
2121
# Check to see if ManualModuleVersion parameter is set to true
2222
if ($ManualModuleVersion) {
2323
$ManualModuleVersionRetrieval = Get-Content -Path:($FilePath_psd1) | Where-Object { $_ -like '*ModuleVersion*' }
2424
$SemanticRegex = [Regex]"[0-9]+.[0-9]+.[0-9]+"
2525
$SemeanticVersion = Select-String -InputObject $ManualModuleVersionRetrieval -pattern ($SemanticRegex)
2626
$ModuleVersion = $SemeanticVersion[0].Matches.Value
2727
} else {
28+
$PSGalleryInfo = Get-PSGalleryModuleVersion -Name:($ModuleName) -ReleaseType:($RELEASETYPE) #('Major', 'Minor', 'Patch')
2829
$ModuleVersion = $PSGalleryInfo.NextVersion
2930
}
3031
Write-Host ('[status]PowerShell Gallery Name:' + $PSGalleryInfo.Name + ';CurrentVersion:' + $PSGalleryInfo.Version + '; NextVersion:' + $ModuleVersion )

‎Deploy/Build.ps1

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,12 @@ param (
1212
. $PSScriptRoot\Get-Config.ps1 -ModuleVersionType:($ModuleVersionType) -ModuleName:($ModuleName)
1313

1414
# Run Build-Module
15-
. $PSScriptRoot\Build-Module.ps1 -ModuleVersionType:($ModuleVersionType) -ModuleName:($ModuleName)
15+
if ($ModuleVersionType -eq 'manual') {
16+
. $PSScriptRoot\Build-Module.ps1 -ModuleVersionType:($ModuleVersionType) -ModuleName:($ModuleName) -ManualModuleVersion:($true)
17+
} else {
18+
. $PSScriptRoot\Build-Module.ps1 -ModuleVersionType:($ModuleVersionType) -ModuleName:($ModuleName)
19+
}
20+
1621
# Run Build-Exe
1722
. $PSScriptRoot\Build-Exe.ps1
1823
# Run Build-HelpFiles

‎ModuleChangelog.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
## 2.6.0
1+
## 2.6.1
22

3-
Release Date: February 7, 2024
3+
Release Date: February 12, 2024
44

55
#### RELEASE NOTES
66

@@ -12,6 +12,7 @@ Release Date: February 7, 2024
1212
```
1313
* Addressed a issue where a registry hive fails to load, the tool will now halt migration instead of continuing
1414
* Fixed a bug with Module Changelog version test where release type number is not properly outputted
15+
* Fix issue with manual release type not included in tests
1516
```
1617
## 2.5.1
1718

‎jumpcloud-ADMU/JumpCloud.ADMU.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
RootModule = 'JumpCloud.ADMU.psm1'
1313

1414
# Version number of this module.
15-
ModuleVersion = '2.6.0'
15+
ModuleVersion = '2.6.1'
1616

1717
# Supported PSEditions
1818
# CompatiblePSEditions = @()

‎jumpcloud-ADMU/Powershell/Form.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ function show-mtpSelection {
143143
<Window
144144
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
145145
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
146-
Title="JumpCloud ADMU 2.6.0"
146+
Title="JumpCloud ADMU 2.6.1"
147147
WindowStyle="SingleBorderWindow"
148148
ResizeMode="NoResize"
149149
Background="White" ScrollViewer.VerticalScrollBarVisibility="Visible" ScrollViewer.HorizontalScrollBarVisibility="Visible" Width="1000" Height="520">

‎jumpcloud-ADMU/Powershell/Start-Migration.ps1

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1120,11 +1120,9 @@ function Test-UsernameOrSID {
11201120
}
11211121
}
11221122
}
1123-
11241123
#endregion Functions
11251124

11261125
#region Agent Install Helper Functions
1127-
11281126
Function Restart-ComputerWithDelay {
11291127
Param(
11301128
[int]$TimeOut = 10
@@ -1412,7 +1410,7 @@ function Set-ADMUScheduledTask {
14121410
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
14131411
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
14141412
# SOFTWARE.
1415-
# Get user file type associations
1413+
# Get user file type associations/FTA
14161414
function Get-UserFileTypeAssociation {
14171415
[CmdletBinding()]
14181416
param (
@@ -1437,8 +1435,7 @@ function Get-UserFileTypeAssociation {
14371435
return $manifestList
14381436
}
14391437

1440-
# Get user protocol associations
1441-
1438+
# Get user protocol associations/PTA
14421439
function Get-ProtocolTypeAssociation{
14431440
[CmdletBinding()]
14441441
param (
@@ -1487,7 +1484,7 @@ Function Start-Migration {
14871484
Begin {
14881485
Write-ToLog -Message:('####################################' + (get-date -format "dd-MMM-yyyy HH:mm") + '####################################')
14891486
# Start script
1490-
$admuVersion = '2.6.0'
1487+
$admuVersion = '2.6.1'
14911488
Write-ToLog -Message:('Running ADMU: ' + 'v' + $admuVersion)
14921489
Write-ToLog -Message:('Script starting; Log file location: ' + $jcAdmuLogFile)
14931490
Write-ToLog -Message:('Gathering system & profile information')

‎jumpcloud-ADMU/Powershell/Tests/Build.Tests.ps1

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,15 @@ Describe "Module Validation Tests" {
3838
$masterform = (Invoke-WebRequest https://raw.githubusercontent.com/TheJumpCloud/jumpcloud-ADMU/master/jumpcloud-ADMU/Powershell/Form.ps1 -useBasicParsing).tostring()
3939
$masterVersion = Select-String -inputobject:($masterform) -Pattern:($VersionRegex)
4040
$masterformversion = [version]$masterversion.Matches.value
41-
$branchformversion | Should -BeGreaterThan $masterformversion
42-
$branchformversion.$($env:ModuleVersionType) | Should -Be ($masterformversion.$($env:ModuleVersionType) + 1)
41+
if($env:ModuleVersionType -eq "manual"){
42+
# Manual Versioning
43+
# Given version should be greater than master
44+
$branchformversion | Should -BeGreaterThan $masterformversion
45+
} else {
46+
$branchformversion | Should -BeGreaterThan $masterformversion
47+
$branchformversion.$($env:ModuleVersionType) | Should -Be ($masterformversion.$($env:ModuleVersionType) + 1)
48+
}
49+
4350
}
4451

4552
It 'Start-Migration version' {
@@ -50,8 +57,12 @@ Describe "Module Validation Tests" {
5057
$masterStartMigration = (Invoke-WebRequest https://raw.githubusercontent.com/TheJumpCloud/jumpcloud-ADMU/master/jumpcloud-ADMU/Powershell/Start-Migration.ps1 -useBasicParsing).tostring()
5158
$masterVersion = Select-String -inputobject:($masterStartMigration) -Pattern:($VersionRegex)
5259
$masterStartMigrationVersion = [version]$masterVersion.Matches.value
53-
$branchStartMigrationVersion | Should -BeGreaterThan $masterStartMigrationVersion
54-
$branchStartMigrationVersion.$($env:ModuleVersionType) | Should -Be ($masterStartMigrationVersion.$($env:ModuleVersionType) + 1)
60+
if ($env:ModuleVersionType -eq "manual") {
61+
$branchStartMigrationVersion | Should -BeGreaterThan $masterStartMigrationVersion
62+
} else {
63+
$branchStartMigrationVersion | Should -BeGreaterThan $masterStartMigrationVersion
64+
$branchStartMigrationVersion.$($env:ModuleVersionType) | Should -Be ($masterStartMigrationVersion.$($env:ModuleVersionType) + 1)
65+
}
5566
}
5667

5768
It 'gui_jcadmu.exe version' -skip {
@@ -60,8 +71,12 @@ Describe "Module Validation Tests" {
6071
$masterVersion = Select-String -inputobject:($masterform) -Pattern:($VersionRegex)
6172
$masterformversion = [version]$masterversion.Matches.value
6273
$exeversion = [version](Get-Item ("$PSScriptRoot\..\..\exe\gui_jcadmu.exe")).VersionInfo.FileVersion
63-
$exeversion | Should -BeGreaterThan $masterformversion
64-
$exeversion.$($env:ModuleVersionType) | Should -Be ($masterformversion.$($env:ModuleVersionType) + 1)
74+
if ($env:ModuleVersionType -eq "manual") {
75+
$exeversion | Should -BeGreaterThan $masterformversion
76+
} else {
77+
$exeversion | Should -BeGreaterThan $masterformversion
78+
$exeversion.$($env:ModuleVersionType) | Should -Be ($masterformversion.$($env:ModuleVersionType) + 1)
79+
}
6580
}
6681
}
6782

@@ -78,9 +93,12 @@ Describe "Module Validation Tests" {
7893
Write-Host "Module Changelog Content: $ModuleChangelogVersionMatch"
7994
$ModuleChangelogVersion = $ModuleChangelogVersionMatch.Matches.Value
8095
Write-Host "Module Changelog Version: $ModuleChangelogVersion"
81-
# Compare
8296
$latestVersion = [version]$lastestModule.version
83-
([version]$ModuleChangelogVersion).$($env:ModuleVersionType) | Should -Be ($latestVersion.$($env:ModuleVersionType) + 1)
97+
if ($env:ModuleVersionType -eq "manual") {
98+
$ModuleChangelogVersion | Should -BeGreaterThan $latestVersion
99+
} else {
100+
([version]$ModuleChangelogVersion).$($env:ModuleVersionType) | Should -Be ($latestVersion.$($env:ModuleVersionType) + 1)
101+
}
84102

85103
}
86104
It 'Module Changelog should not contain placeholder values' {

0 commit comments

Comments
 (0)