Skip to content

Commit b177b8f

Browse files
committed
wip
1 parent e840292 commit b177b8f

File tree

2 files changed

+65
-64
lines changed

2 files changed

+65
-64
lines changed

.github/workflows/test.main.kts

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,21 @@
2828
@file:DependsOn("actions:checkout___major:[v4,v5-alpha)")
2929
@file:DependsOn("actions:setup-java___major:[v4,v5-alpha)")
3030
@file:DependsOn("gradle:actions__setup-gradle___major:[v4,v5-alpha)")
31+
@file:DependsOn("mxschmitt:action-tmate___major:[v3,v4-alpha)")
32+
@file:DependsOn("msys2:setup-msys2___major:[v2,v3-alpha)")
3133
@file:DependsOn("Vampire:setup-wsl:RELEASE")
3234

3335
import io.github.typesafegithub.workflows.actions.actions.CacheRestore
3436
import io.github.typesafegithub.workflows.actions.actions.CacheSave
3537
import io.github.typesafegithub.workflows.actions.actions.Checkout
3638
import io.github.typesafegithub.workflows.actions.actions.SetupJava
39+
import io.github.typesafegithub.workflows.actions.actions.SetupJava.Distribution.Liberica
3740
import io.github.typesafegithub.workflows.actions.actions.SetupJava.Distribution.Temurin
3841
import io.github.typesafegithub.workflows.actions.gradle.ActionsSetupGradle
3942
import io.github.typesafegithub.workflows.actions.gradle.ActionsSetupGradle.BuildScanTermsOfUseAgree.Yes
4043
import io.github.typesafegithub.workflows.actions.gradle.ActionsSetupGradle.BuildScanTermsOfUseUrl.HttpsGradleComHelpLegalTermsOfUse
44+
import io.github.typesafegithub.workflows.actions.msys2.SetupMsys2_Untyped
45+
import io.github.typesafegithub.workflows.actions.mxschmitt.ActionTmate
4146
import io.github.typesafegithub.workflows.actions.vampire.SetupWsl
4247
import io.github.typesafegithub.workflows.actions.vampire.SetupWsl.Distribution.Debian
4348
import io.github.typesafegithub.workflows.actions.vampire.SetupWsl.Distribution.Ubuntu1604
@@ -69,9 +74,10 @@ import kotlin.math.min
6974
//) = Unit
7075

7176
val environments = listOf(
72-
"windows-2022",
73-
"windows-2025",
74-
"windows-latest"
77+
// "windows-2022",
78+
// "windows-2025",
79+
"windows-latest",
80+
"windows-11-arm"
7581
)
7682

7783
val debian = Distribution(
@@ -177,7 +183,8 @@ workflowWithCopyright(
177183
val build = job(
178184
id = "build",
179185
name = "Build",
180-
runsOn = WindowsLatest
186+
// runsOn = WindowsLatest
187+
runsOn = RunnerType.Custom("windows-11-arm")
181188
) {
182189
run(
183190
name = "Configure Git",
@@ -187,11 +194,18 @@ workflowWithCopyright(
187194
name = "Checkout",
188195
action = Checkout()
189196
)
197+
val setupMsys2 = uses(action = SetupMsys2_Untyped())
198+
uses(
199+
action = ActionTmate(
200+
msys2Location = expr(setupMsys2.outputs.msys2Location)
201+
)
202+
)
190203
uses(
191204
name = "Setup Java 11",
192205
action = SetupJava(
193206
javaVersion = "11",
194-
distribution = Temurin
207+
// distribution = Temurin
208+
distribution = Liberica
195209
)
196210
)
197211
uses(
@@ -217,7 +231,8 @@ workflowWithCopyright(
217231
name = "Save built artifacts to cache",
218232
action = CacheSave(
219233
path = builtArtifacts,
220-
key = expr { github.run_id }
234+
key = expr { github.run_id },
235+
enableCrossOsArchive = true
221236
)
222237
)
223238
}
@@ -241,7 +256,8 @@ workflowWithCopyright(
241256
action = CacheRestore(
242257
path = builtArtifacts,
243258
key = expr { github.run_id },
244-
failOnCacheMiss = true
259+
failOnCacheMiss = true,
260+
enableCrossOsArchive = true
245261
)
246262
)
247263
block()

0 commit comments

Comments
 (0)