@@ -69,7 +69,6 @@ import kotlin.math.min
69
69
// ) = Unit
70
70
71
71
val environments = listOf (
72
- " windows-2019" ,
73
72
" windows-2022" ,
74
73
" windows-2025" ,
75
74
" windows-latest"
@@ -237,6 +236,15 @@ workflowWithCopyright(
237
236
runsOn = RunnerType .Custom (expr(" matrix.environment" )),
238
237
_customArguments = _customArguments
239
238
) {
239
+ // work-around for https://github.com/actions/cache/issues/1622
240
+ // and https://github.com/actions/partner-runner-images/issues/99
241
+ run (
242
+ name = " Install zstd on windows-11-arm" ,
243
+ shell = Cmd ,
244
+ command = " choco install zstandard" ,
245
+ condition = " matrix.environment == 'windows-11-arm'"
246
+ )
247
+
240
248
uses(
241
249
name = " Restore built artifacts from cache" ,
242
250
action = CacheRestore (
@@ -293,13 +301,7 @@ workflowWithCopyright(
293
301
" fail-fast" to false ,
294
302
" matrix" to mapOf (
295
303
" 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
- )
304
+ " wsl-version" to listOf (" -1" , " 0" )
303
305
)
304
306
)
305
307
)
@@ -777,7 +779,7 @@ workflowWithCopyright(
777
779
" strategy" to mapOf (
778
780
" fail-fast" to false ,
779
781
" matrix" to mapOf (
780
- " environment" to ( environments - " windows-2019 " ) ,
782
+ " environment" to environments,
781
783
" distribution" to distributions,
782
784
" wsl-version" to (1 .. 2 ).toList()
783
785
)
@@ -817,7 +819,7 @@ workflowWithCopyright(
817
819
" strategy" to mapOf (
818
820
" fail-fast" to false ,
819
821
" matrix" to mapOf (
820
- " environment" to ( environments - " windows-2019 " )
822
+ " environment" to environments
821
823
)
822
824
)
823
825
)
@@ -881,16 +883,6 @@ workflowWithCopyright(
881
883
)
882
884
verifyCommandResult(
883
885
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
- },
894
886
actualCommand = """
895
887
cat
896
888
<(wsl.exe --list --verbose || true)
@@ -1396,15 +1388,12 @@ fun Step<*>.getSuccessOnOrNotOnDistributionCondition(distribution: Distribution,
1396
1388
// and https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/2069555
1397
1389
fun getWslVersionExpression (vararg wsl2Distributions : Distribution ) = """
1398
1390
|(
1399
- | (
1400
- ${
1401
- wsl2Distributions.joinToString(
1402
- separator = " \n | || " ,
1403
- prefix = " | "
1404
- ) { " (matrix.distribution.user-id == '${it.userId} ')" }
1405
- }
1406
- | )
1407
- | && (matrix.environment != 'windows-2019')
1391
+ ${
1392
+ wsl2Distributions.joinToString(
1393
+ separator = " \n | || " ,
1394
+ prefix = " | "
1395
+ ) { " (matrix.distribution.user-id == '${it.userId} ')" }
1396
+ }
1408
1397
|)
1409
1398
|&& '2'
1410
1399
||| '1'
0 commit comments