Skip to content

Commit bd217b8

Browse files
VampireVampire
committed
wip
1 parent e840292 commit bd217b8

File tree

2 files changed

+46
-61
lines changed

2 files changed

+46
-61
lines changed

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

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import io.github.typesafegithub.workflows.actions.actions.CacheRestore
3434
import io.github.typesafegithub.workflows.actions.actions.CacheSave
3535
import io.github.typesafegithub.workflows.actions.actions.Checkout
3636
import io.github.typesafegithub.workflows.actions.actions.SetupJava
37+
import io.github.typesafegithub.workflows.actions.actions.SetupJava.Distribution.Liberica
3738
import io.github.typesafegithub.workflows.actions.actions.SetupJava.Distribution.Temurin
3839
import io.github.typesafegithub.workflows.actions.gradle.ActionsSetupGradle
3940
import io.github.typesafegithub.workflows.actions.gradle.ActionsSetupGradle.BuildScanTermsOfUseAgree.Yes
@@ -69,9 +70,10 @@ import kotlin.math.min
6970
//) = Unit
7071

7172
val environments = listOf(
72-
"windows-2022",
73-
"windows-2025",
74-
"windows-latest"
73+
// "windows-2022",
74+
// "windows-2025",
75+
"windows-latest",
76+
"windows-11-arm"
7577
)
7678

7779
val debian = Distribution(
@@ -177,7 +179,8 @@ workflowWithCopyright(
177179
val build = job(
178180
id = "build",
179181
name = "Build",
180-
runsOn = WindowsLatest
182+
// runsOn = WindowsLatest
183+
runsOn = RunnerType.Custom("windows-11-arm")
181184
) {
182185
run(
183186
name = "Configure Git",
@@ -191,7 +194,8 @@ workflowWithCopyright(
191194
name = "Setup Java 11",
192195
action = SetupJava(
193196
javaVersion = "11",
194-
distribution = Temurin
197+
// distribution = Temurin
198+
distribution = Liberica
195199
)
196200
)
197201
uses(
@@ -217,7 +221,8 @@ workflowWithCopyright(
217221
name = "Save built artifacts to cache",
218222
action = CacheSave(
219223
path = builtArtifacts,
220-
key = expr { github.run_id }
224+
key = expr { github.run_id },
225+
enableCrossOsArchive = true
221226
)
222227
)
223228
}
@@ -241,7 +246,8 @@ workflowWithCopyright(
241246
action = CacheRestore(
242247
path = builtArtifacts,
243248
key = expr { github.run_id },
244-
failOnCacheMiss = true
249+
failOnCacheMiss = true,
250+
enableCrossOsArchive = true
245251
)
246252
)
247253
block()

‎.github/workflows/test.yaml‎

Lines changed: 33 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
run: 'git diff --exit-code ''.github/workflows/test.yaml'''
4242
build:
4343
name: 'Build'
44-
runs-on: 'windows-latest'
44+
runs-on: 'windows-11-arm'
4545
needs:
4646
- 'check_yaml_consistency'
4747
steps:
@@ -56,7 +56,7 @@ jobs:
5656
uses: 'actions/setup-java@v4'
5757
with:
5858
java-version: '11'
59-
distribution: 'temurin'
59+
distribution: 'liberica'
6060
- id: 'step-3'
6161
name: 'Setup Gradle'
6262
uses: 'gradle/actions/setup-gradle@v4'
@@ -76,6 +76,7 @@ jobs:
7676
action.yml
7777
build/distributions/
7878
key: '${{ github.run_id }}'
79+
enableCrossOsArchive: 'true'
7980
test_invalid_distribution:
8081
name: 'Test "${{ matrix.distribution.label }}" distribution on ${{ matrix.environment }}'
8182
runs-on: '${{ matrix.environment }}'
@@ -86,9 +87,8 @@ jobs:
8687
fail-fast: false
8788
matrix:
8889
environment:
89-
- 'windows-2022'
90-
- 'windows-2025'
9190
- 'windows-latest'
91+
- 'windows-11-arm'
9292
distribution:
9393
- user-id: 'invalid'
9494
label: 'invalid'
@@ -105,6 +105,7 @@ jobs:
105105
action.yml
106106
build/distributions/
107107
key: '${{ github.run_id }}'
108+
enableCrossOsArchive: 'true'
108109
fail-on-cache-miss: 'true'
109110
- id: 'step-1'
110111
name: 'Execute action'
@@ -127,9 +128,8 @@ jobs:
127128
fail-fast: false
128129
matrix:
129130
environment:
130-
- 'windows-2022'
131-
- 'windows-2025'
132131
- 'windows-latest'
132+
- 'windows-11-arm'
133133
wsl-version:
134134
- '-1'
135135
- '0'
@@ -142,6 +142,7 @@ jobs:
142142
action.yml
143143
build/distributions/
144144
key: '${{ github.run_id }}'
145+
enableCrossOsArchive: 'true'
145146
fail-on-cache-miss: 'true'
146147
- id: 'step-1'
147148
name: 'Execute action'
@@ -164,9 +165,8 @@ jobs:
164165
fail-fast: false
165166
matrix:
166167
environment:
167-
- 'windows-2022'
168-
- 'windows-2025'
169168
- 'windows-latest'
169+
- 'windows-11-arm'
170170
distribution:
171171
- wsl-id: 'Debian'
172172
user-id: 'Debian'
@@ -181,6 +181,7 @@ jobs:
181181
action.yml
182182
build/distributions/
183183
key: '${{ github.run_id }}'
184+
enableCrossOsArchive: 'true'
184185
fail-on-cache-miss: 'true'
185186
- id: 'step-1'
186187
name: 'Execute action'
@@ -369,9 +370,8 @@ jobs:
369370
fail-fast: false
370371
matrix:
371372
environment:
372-
- 'windows-2022'
373-
- 'windows-2025'
374373
- 'windows-latest'
374+
- 'windows-11-arm'
375375
distribution:
376376
- wsl-id: 'Debian'
377377
user-id: 'Debian'
@@ -418,6 +418,7 @@ jobs:
418418
action.yml
419419
build/distributions/
420420
key: '${{ github.run_id }}'
421+
enableCrossOsArchive: 'true'
421422
fail-on-cache-miss: 'true'
422423
- id: 'step-1'
423424
name: 'Execute action'
@@ -888,9 +889,8 @@ jobs:
888889
fail-fast: false
889890
matrix:
890891
environment:
891-
- 'windows-2022'
892-
- 'windows-2025'
893892
- 'windows-latest'
893+
- 'windows-11-arm'
894894
distribution:
895895
- wsl-id: 'Debian'
896896
user-id: 'Debian'
@@ -937,6 +937,7 @@ jobs:
937937
action.yml
938938
build/distributions/
939939
key: '${{ github.run_id }}'
940+
enableCrossOsArchive: 'true'
940941
fail-on-cache-miss: 'true'
941942
- id: 'step-1'
942943
name: 'Execute action'
@@ -997,9 +998,8 @@ jobs:
997998
fail-fast: false
998999
matrix:
9991000
environment:
1000-
- 'windows-2022'
1001-
- 'windows-2025'
10021001
- 'windows-latest'
1002+
- 'windows-11-arm'
10031003
distribution:
10041004
- wsl-id: 'Debian'
10051005
user-id: 'Debian'
@@ -1046,6 +1046,7 @@ jobs:
10461046
action.yml
10471047
build/distributions/
10481048
key: '${{ github.run_id }}'
1049+
enableCrossOsArchive: 'true'
10491050
fail-on-cache-miss: 'true'
10501051
- id: 'step-1'
10511052
name: 'Execute action'
@@ -1142,9 +1143,8 @@ jobs:
11421143
fail-fast: false
11431144
matrix:
11441145
environment:
1145-
- 'windows-2022'
1146-
- 'windows-2025'
11471146
- 'windows-latest'
1147+
- 'windows-11-arm'
11481148
distribution:
11491149
- wsl-id: 'Debian'
11501150
user-id: 'Debian'
@@ -1191,6 +1191,7 @@ jobs:
11911191
action.yml
11921192
build/distributions/
11931193
key: '${{ github.run_id }}'
1194+
enableCrossOsArchive: 'true'
11941195
fail-on-cache-miss: 'true'
11951196
- id: 'step-1'
11961197
name: 'Execute action'
@@ -1235,9 +1236,8 @@ jobs:
12351236
fail-fast: false
12361237
matrix:
12371238
environment:
1238-
- 'windows-2022'
1239-
- 'windows-2025'
12401239
- 'windows-latest'
1240+
- 'windows-11-arm'
12411241
distribution:
12421242
- wsl-id: 'Debian'
12431243
user-id: 'Debian'
@@ -1287,6 +1287,7 @@ jobs:
12871287
action.yml
12881288
build/distributions/
12891289
key: '${{ github.run_id }}'
1290+
enableCrossOsArchive: 'true'
12901291
fail-on-cache-miss: 'true'
12911292
- id: 'step-1'
12921293
name: 'Execute action'
@@ -1317,9 +1318,8 @@ jobs:
13171318
fail-fast: false
13181319
matrix:
13191320
environment:
1320-
- 'windows-2022'
1321-
- 'windows-2025'
13221321
- 'windows-latest'
1322+
- 'windows-11-arm'
13231323
steps:
13241324
- id: 'step-0'
13251325
name: 'Restore built artifacts from cache'
@@ -1329,6 +1329,7 @@ jobs:
13291329
action.yml
13301330
build/distributions/
13311331
key: '${{ github.run_id }}'
1332+
enableCrossOsArchive: 'true'
13321333
fail-on-cache-miss: 'true'
13331334
- id: 'step-1'
13341335
name: 'Execute action'
@@ -1367,9 +1368,8 @@ jobs:
13671368
fail-fast: false
13681369
matrix:
13691370
environment:
1370-
- 'windows-2022'
1371-
- 'windows-2025'
13721371
- 'windows-latest'
1372+
- 'windows-11-arm'
13731373
distribution:
13741374
- wsl-id: 'Debian'
13751375
user-id: 'Debian'
@@ -1416,6 +1416,7 @@ jobs:
14161416
action.yml
14171417
build/distributions/
14181418
key: '${{ github.run_id }}'
1419+
enableCrossOsArchive: 'true'
14191420
fail-on-cache-miss: 'true'
14201421
- id: 'step-1'
14211422
name: 'Execute action'
@@ -1445,9 +1446,8 @@ jobs:
14451446
fail-fast: false
14461447
matrix:
14471448
environment:
1448-
- 'windows-2022'
1449-
- 'windows-2025'
14501449
- 'windows-latest'
1450+
- 'windows-11-arm'
14511451
distributions:
14521452
- distribution1:
14531453
wsl-id: 'Debian'
@@ -1548,6 +1548,7 @@ jobs:
15481548
action.yml
15491549
build/distributions/
15501550
key: '${{ github.run_id }}'
1551+
enableCrossOsArchive: 'true'
15511552
fail-on-cache-miss: 'true'
15521553
- id: 'step-1'
15531554
name: 'Execute action for ${{ matrix.distributions.distribution1.user-id }}'
@@ -1601,9 +1602,8 @@ jobs:
16011602
fail-fast: false
16021603
matrix:
16031604
environment:
1604-
- 'windows-2022'
1605-
- 'windows-2025'
16061605
- 'windows-latest'
1606+
- 'windows-11-arm'
16071607
distribution:
16081608
- wsl-id: 'Debian'
16091609
user-id: 'Debian'
@@ -1647,18 +1647,7 @@ jobs:
16471647
match-pattern: '*Debian*'
16481648
default-absent-tool: 'dos2unix'
16491649
exclude:
1650-
- environment: 'windows-2022'
1651-
distribution:
1652-
wsl-id: 'Debian'
1653-
user-id: 'Debian'
1654-
match-pattern: '*Debian*'
1655-
default-absent-tool: 'dos2unix'
1656-
distribution2:
1657-
wsl-id: 'Debian'
1658-
user-id: 'Debian'
1659-
match-pattern: '*Debian*'
1660-
default-absent-tool: 'dos2unix'
1661-
- environment: 'windows-2025'
1650+
- environment: 'windows-latest'
16621651
distribution:
16631652
wsl-id: 'Debian'
16641653
user-id: 'Debian'
@@ -1669,7 +1658,7 @@ jobs:
16691658
user-id: 'Debian'
16701659
match-pattern: '*Debian*'
16711660
default-absent-tool: 'dos2unix'
1672-
- environment: 'windows-latest'
1661+
- environment: 'windows-11-arm'
16731662
distribution:
16741663
wsl-id: 'Debian'
16751664
user-id: 'Debian'
@@ -1681,18 +1670,7 @@ jobs:
16811670
match-pattern: '*Debian*'
16821671
default-absent-tool: 'dos2unix'
16831672
include:
1684-
- environment: 'windows-2022'
1685-
distribution:
1686-
wsl-id: 'Debian'
1687-
user-id: 'Debian'
1688-
match-pattern: '*Debian*'
1689-
default-absent-tool: 'dos2unix'
1690-
distribution2:
1691-
wsl-id: 'Ubuntu'
1692-
user-id: 'Ubuntu-20.04'
1693-
match-pattern: '*Ubuntu*20.04*'
1694-
default-absent-tool: 'dos2unix'
1695-
- environment: 'windows-2025'
1673+
- environment: 'windows-latest'
16961674
distribution:
16971675
wsl-id: 'Debian'
16981676
user-id: 'Debian'
@@ -1703,7 +1681,7 @@ jobs:
17031681
user-id: 'Ubuntu-20.04'
17041682
match-pattern: '*Ubuntu*20.04*'
17051683
default-absent-tool: 'dos2unix'
1706-
- environment: 'windows-latest'
1684+
- environment: 'windows-11-arm'
17071685
distribution:
17081686
wsl-id: 'Debian'
17091687
user-id: 'Debian'
@@ -1723,6 +1701,7 @@ jobs:
17231701
action.yml
17241702
build/distributions/
17251703
key: '${{ github.run_id }}'
1704+
enableCrossOsArchive: 'true'
17261705
fail-on-cache-miss: 'true'
17271706
- id: 'step-1'
17281707
name: 'Execute action'
@@ -1839,9 +1818,8 @@ jobs:
18391818
fail-fast: false
18401819
matrix:
18411820
environment:
1842-
- 'windows-2022'
1843-
- 'windows-2025'
18441821
- 'windows-latest'
1822+
- 'windows-11-arm'
18451823
distributions:
18461824
- incompatibleUbuntu: 'Ubuntu-22.04'
18471825
distribution1:
@@ -1934,6 +1912,7 @@ jobs:
19341912
action.yml
19351913
build/distributions/
19361914
key: '${{ github.run_id }}'
1915+
enableCrossOsArchive: 'true'
19371916
fail-on-cache-miss: 'true'
19381917
- id: 'step-1'
19391918
name: 'Execute action for ${{ matrix.distributions.distribution1.user-id }}'

0 commit comments

Comments
 (0)