Skip to content

Commit cbf3871

Browse files
VampireVampire
committed
Remove tests on windows-2019 which was decommissioned
1 parent af172e2 commit cbf3871

2 files changed

Lines changed: 11 additions & 82 deletions

File tree

‎.github/workflows/test.main.kts‎

Lines changed: 9 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ import kotlin.math.min
6969
//) = Unit
7070

7171
val environments = listOf(
72-
"windows-2019",
7372
"windows-2022",
7473
"windows-2025",
7574
"windows-latest"
@@ -293,13 +292,7 @@ workflowWithCopyright(
293292
"fail-fast" to false,
294293
"matrix" to mapOf(
295294
"environment" to environments,
296-
"wsl-version" to listOf("-1", "0"),
297-
"include" to listOf(
298-
mapOf(
299-
"environment" to "windows-2019",
300-
"wsl-version" to "2"
301-
)
302-
)
295+
"wsl-version" to listOf("-1", "0")
303296
)
304297
)
305298
)
@@ -777,7 +770,7 @@ workflowWithCopyright(
777770
"strategy" to mapOf(
778771
"fail-fast" to false,
779772
"matrix" to mapOf(
780-
"environment" to (environments - "windows-2019"),
773+
"environment" to environments,
781774
"distribution" to distributions,
782775
"wsl-version" to (1..2).toList()
783776
)
@@ -817,7 +810,7 @@ workflowWithCopyright(
817810
"strategy" to mapOf(
818811
"fail-fast" to false,
819812
"matrix" to mapOf(
820-
"environment" to (environments - "windows-2019")
813+
"environment" to environments
821814
)
822815
)
823816
)
@@ -881,16 +874,6 @@ workflowWithCopyright(
881874
)
882875
verifyCommandResult(
883876
name = "Test - default WSL version should be WSLv2",
884-
// on windows-2019 the version is not printed but the wrong
885-
// default (anything but WSLv1) would already make the action execution fail
886-
conditionTransformer = {
887-
"""
888-
|(
889-
${it.prependIndent("| ")}
890-
|)
891-
|&& (matrix.environment != 'windows-2019')
892-
""".trimMargin()
893-
},
894877
actualCommand = """
895878
cat
896879
<(wsl.exe --list --verbose || true)
@@ -1396,15 +1379,12 @@ fun Step<*>.getSuccessOnOrNotOnDistributionCondition(distribution: Distribution,
13961379
// and https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/2069555
13971380
fun getWslVersionExpression(vararg wsl2Distributions: Distribution) = """
13981381
|(
1399-
| (
1400-
${
1401-
wsl2Distributions.joinToString(
1402-
separator = "\n| || ",
1403-
prefix = "| "
1404-
) { "(matrix.distribution.user-id == '${it.userId}')" }
1405-
}
1406-
| )
1407-
| && (matrix.environment != 'windows-2019')
1382+
${
1383+
wsl2Distributions.joinToString(
1384+
separator = "\n| || ",
1385+
prefix = "| "
1386+
) { "(matrix.distribution.user-id == '${it.userId}')" }
1387+
}
14081388
|)
14091389
|&& '2'
14101390
||| '1'

‎.github/workflows/test.yaml‎

Lines changed: 2 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ jobs:
8686
fail-fast: false
8787
matrix:
8888
environment:
89-
- 'windows-2019'
9089
- 'windows-2022'
9190
- 'windows-2025'
9291
- 'windows-latest'
@@ -128,16 +127,12 @@ jobs:
128127
fail-fast: false
129128
matrix:
130129
environment:
131-
- 'windows-2019'
132130
- 'windows-2022'
133131
- 'windows-2025'
134132
- 'windows-latest'
135133
wsl-version:
136134
- '-1'
137135
- '0'
138-
include:
139-
- environment: 'windows-2019'
140-
wsl-version: '2'
141136
steps:
142137
- id: 'step-0'
143138
name: 'Restore built artifacts from cache'
@@ -169,7 +164,6 @@ jobs:
169164
fail-fast: false
170165
matrix:
171166
environment:
172-
- 'windows-2019'
173167
- 'windows-2022'
174168
- 'windows-2025'
175169
- 'windows-latest'
@@ -375,7 +369,6 @@ jobs:
375369
fail-fast: false
376370
matrix:
377371
environment:
378-
- 'windows-2019'
379372
- 'windows-2022'
380373
- 'windows-2025'
381374
- 'windows-latest'
@@ -434,10 +427,7 @@ jobs:
434427
use-cache: 'false'
435428
wsl-version: |-
436429
${{ (
437-
(
438430
(matrix.distribution.user-id == 'kali-linux')
439-
)
440-
&& (matrix.environment != 'windows-2019')
441431
)
442432
&& '2'
443433
|| '1' }}
@@ -898,7 +888,6 @@ jobs:
898888
fail-fast: false
899889
matrix:
900890
environment:
901-
- 'windows-2019'
902891
- 'windows-2022'
903892
- 'windows-2025'
904893
- 'windows-latest'
@@ -1008,7 +997,6 @@ jobs:
1008997
fail-fast: false
1009998
matrix:
1010999
environment:
1011-
- 'windows-2019'
10121000
- 'windows-2022'
10131001
- 'windows-2025'
10141002
- 'windows-latest'
@@ -1154,7 +1142,6 @@ jobs:
11541142
fail-fast: false
11551143
matrix:
11561144
environment:
1157-
- 'windows-2019'
11581145
- 'windows-2022'
11591146
- 'windows-2025'
11601147
- 'windows-latest'
@@ -1213,10 +1200,7 @@ jobs:
12131200
additional-packages: '${{ matrix.distribution.default-absent-tool }} bash'
12141201
wsl-version: |-
12151202
${{ (
1216-
(
12171203
(matrix.distribution.user-id == 'kali-linux')
1218-
)
1219-
&& (matrix.environment != 'windows-2019')
12201204
)
12211205
&& '2'
12221206
|| '1' }}
@@ -1383,7 +1367,6 @@ jobs:
13831367
fail-fast: false
13841368
matrix:
13851369
environment:
1386-
- 'windows-2019'
13871370
- 'windows-2022'
13881371
- 'windows-2025'
13891372
- 'windows-latest'
@@ -1450,11 +1433,8 @@ jobs:
14501433
cat <(wsl.exe --list --verbose || true) <(wsl.exe --list --verbose || true | iconv -f UTF-16LE -t UTF-8)
14511434
[[ "$(cat <(wsl.exe --list --verbose || true) <(wsl.exe --list --verbose || true | iconv -f UTF-16LE -t UTF-8))" == *${{ matrix.distribution.wsl-id }}*\ 2* ]]
14521435
if: |-
1453-
(
1454-
always()
1455-
&& (steps.step-1.outcome == 'success')
1456-
)
1457-
&& (matrix.environment != 'windows-2019')
1436+
always()
1437+
&& (steps.step-1.outcome == 'success')
14581438
test_multiple_usage_with_different_distributions:
14591439
name: 'Test multiple usage with different distributions ("${{ matrix.distributions.distribution1.user-id }}" / "${{ matrix.distributions.distribution2.user-id }}" / "${{ matrix.distributions.distribution3.user-id }}") on ${{ matrix.environment }}'
14601440
runs-on: '${{ matrix.environment }}'
@@ -1465,7 +1445,6 @@ jobs:
14651445
fail-fast: false
14661446
matrix:
14671447
environment:
1468-
- 'windows-2019'
14691448
- 'windows-2022'
14701449
- 'windows-2025'
14711450
- 'windows-latest'
@@ -1622,7 +1601,6 @@ jobs:
16221601
fail-fast: false
16231602
matrix:
16241603
environment:
1625-
- 'windows-2019'
16261604
- 'windows-2022'
16271605
- 'windows-2025'
16281606
- 'windows-latest'
@@ -1669,17 +1647,6 @@ jobs:
16691647
match-pattern: '*Debian*'
16701648
default-absent-tool: 'dos2unix'
16711649
exclude:
1672-
- environment: 'windows-2019'
1673-
distribution:
1674-
wsl-id: 'Debian'
1675-
user-id: 'Debian'
1676-
match-pattern: '*Debian*'
1677-
default-absent-tool: 'dos2unix'
1678-
distribution2:
1679-
wsl-id: 'Debian'
1680-
user-id: 'Debian'
1681-
match-pattern: '*Debian*'
1682-
default-absent-tool: 'dos2unix'
16831650
- environment: 'windows-2022'
16841651
distribution:
16851652
wsl-id: 'Debian'
@@ -1714,17 +1681,6 @@ jobs:
17141681
match-pattern: '*Debian*'
17151682
default-absent-tool: 'dos2unix'
17161683
include:
1717-
- environment: 'windows-2019'
1718-
distribution:
1719-
wsl-id: 'Debian'
1720-
user-id: 'Debian'
1721-
match-pattern: '*Debian*'
1722-
default-absent-tool: 'dos2unix'
1723-
distribution2:
1724-
wsl-id: 'Ubuntu'
1725-
user-id: 'Ubuntu-20.04'
1726-
match-pattern: '*Ubuntu*20.04*'
1727-
default-absent-tool: 'dos2unix'
17281684
- environment: 'windows-2022'
17291685
distribution:
17301686
wsl-id: 'Debian'
@@ -1779,10 +1735,7 @@ jobs:
17791735
|| '' }}
17801736
wsl-version: |-
17811737
${{ (
1782-
(
17831738
(matrix.distribution.user-id == 'Ubuntu-24.04')
1784-
)
1785-
&& (matrix.environment != 'windows-2019')
17861739
)
17871740
&& '2'
17881741
|| '1' }}
@@ -1799,10 +1752,7 @@ jobs:
17991752
|| (
18001753
(
18011754
(
1802-
(
18031755
(matrix.distribution.user-id == 'Ubuntu-24.04')
1804-
)
1805-
&& (matrix.environment != 'windows-2019')
18061756
)
18071757
&& '2'
18081758
|| '1'
@@ -1889,7 +1839,6 @@ jobs:
18891839
fail-fast: false
18901840
matrix:
18911841
environment:
1892-
- 'windows-2019'
18931842
- 'windows-2022'
18941843
- 'windows-2025'
18951844
- 'windows-latest'

0 commit comments

Comments
 (0)
⚡