@@ -69,7 +69,6 @@ import kotlin.math.min
6969// ) = Unit
7070
7171val environments = listOf (
72- " windows-2019" ,
7372 " windows-2022" ,
7473 " windows-2025" ,
7574 " windows-latest"
@@ -237,6 +236,15 @@ workflowWithCopyright(
237236 runsOn = RunnerType .Custom (expr(" matrix.environment" )),
238237 _customArguments = _customArguments
239238 ) {
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+
240248 uses(
241249 name = " Restore built artifacts from cache" ,
242250 action = CacheRestore (
@@ -293,13 +301,7 @@ workflowWithCopyright(
293301 " fail-fast" to false ,
294302 " matrix" to mapOf (
295303 " 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" )
303305 )
304306 )
305307 )
@@ -777,7 +779,7 @@ workflowWithCopyright(
777779 " strategy" to mapOf (
778780 " fail-fast" to false ,
779781 " matrix" to mapOf (
780- " environment" to ( environments - " windows-2019 " ) ,
782+ " environment" to environments,
781783 " distribution" to distributions,
782784 " wsl-version" to (1 .. 2 ).toList()
783785 )
@@ -817,7 +819,7 @@ workflowWithCopyright(
817819 " strategy" to mapOf (
818820 " fail-fast" to false ,
819821 " matrix" to mapOf (
820- " environment" to ( environments - " windows-2019 " )
822+ " environment" to environments
821823 )
822824 )
823825 )
@@ -881,16 +883,6 @@ workflowWithCopyright(
881883 )
882884 verifyCommandResult(
883885 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- },
894886 actualCommand = """
895887 cat
896888 <(wsl.exe --list --verbose || true)
@@ -1396,15 +1388,12 @@ fun Step<*>.getSuccessOnOrNotOnDistributionCondition(distribution: Distribution,
13961388// and https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/2069555
13971389fun getWslVersionExpression (vararg wsl2Distributions : Distribution ) = """
13981390 |(
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+ }
14081397 |)
14091398 |&& '2'
14101399 ||| '1'
0 commit comments