Skip to content

Commit c664539

Browse files
committed
Fix: Revert "Add pwsh 7.5.0 variants" and enhance tag determination
Reverts theohbrothers#82
1 parent fe28238 commit c664539

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

generate/definitions/VARIANTS.ps1

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@ $local:BASE_IMAGE_TAGS = @(
66

77
foreach ($v in $local:VERSIONS.pwsh.versions) {
88
$v = [version]$v
9-
$r.tags | ? { $_ -match "^(lts-)?$( $v.Major )\.$( $v.Minor )(\.\d+)?-alpine-\d+\.\d+" } | Select-Object -Last 1
9+
$t = $r.tags | ? { $_ -match "^(lts-)?$( $v.Major )\.$( $v.Minor )(\.\d+)?-alpine-\d+\.\d+" } | Select-Object -Last 1
10+
if ($null -eq $t) {
11+
throw "No tag found for $v"
12+
}
13+
$t
1014
}
1115
'7.1.5-alpine-3.13-20211021'
1216
'7.0.3-alpine-3.9-20200928'
@@ -15,7 +19,11 @@ $local:BASE_IMAGE_TAGS = @(
1519

1620
foreach ($v in $local:VERSIONS.pwsh.versions) {
1721
$v = [version]$v
18-
$r.tags | ? { $_ -match "^(lts-)?$( $v.Major )\.$( $v.Minor )(\.\d+)?-ubuntu-\d+\.\d+$" } | Select-Object -Last 1
22+
$t = $r.tags | ? { $_ -match "^(lts-)?$( $v.Major )\.$( $v.Minor )(\.\d+)?-ubuntu-\d+\.\d+$" } | Select-Object -Last 1
23+
if ($null -eq $t) {
24+
throw "No tag found for $v"
25+
}
26+
$t
1927
}
2028
'7.1.5-ubuntu-20.04-20211021'
2129
'7.0.3-ubuntu-18.04-20201027'

generate/definitions/versions.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"pwsh": {
33
"versions": [
4-
"7.5.0",
54
"7.4.6",
65
"7.3.12",
76
"7.2.24"

0 commit comments

Comments
 (0)