Skip to content

Commit bc8cadb

Browse files
GedochaoGedochao
authored
Pin scala-cli-setup version to be M1-compatible & use it in native-macos-m1-tests (#2568)
1 parent 46faae8 commit bc8cadb

File tree

1 file changed

+39
-38
lines changed

1 file changed

+39
-38
lines changed

‎.github/workflows/ci.yml

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
with:
2222
fetch-depth: 0
2323
submodules: true
24-
- uses: VirtusLab/scala-cli-setup@6e130d1f4a0d65d57b354dd58cd3de8a60c264d7
24+
- uses: VirtusLab/scala-cli-setup@5b1a6c5ca98b5642996812781f6ad9b2d5935f85
2525
with:
2626
jvm: "temurin:17"
2727
- name: Copy launcher
@@ -59,7 +59,7 @@ jobs:
5959
with:
6060
fetch-depth: 0
6161
submodules: true
62-
- uses: VirtusLab/scala-cli-setup@6e130d1f4a0d65d57b354dd58cd3de8a60c264d7
62+
- uses: VirtusLab/scala-cli-setup@5b1a6c5ca98b5642996812781f6ad9b2d5935f85
6363
with:
6464
jvm: "temurin:17"
6565
- name: JVM integration tests
@@ -87,7 +87,7 @@ jobs:
8787
with:
8888
fetch-depth: 0
8989
submodules: true
90-
- uses: VirtusLab/scala-cli-setup@6e130d1f4a0d65d57b354dd58cd3de8a60c264d7
90+
- uses: VirtusLab/scala-cli-setup@5b1a6c5ca98b5642996812781f6ad9b2d5935f85
9191
with:
9292
jvm: "temurin:17"
9393
- name: JVM integration tests
@@ -112,7 +112,7 @@ jobs:
112112
with:
113113
fetch-depth: 0
114114
submodules: true
115-
- uses: VirtusLab/scala-cli-setup@6e130d1f4a0d65d57b354dd58cd3de8a60c264d7
115+
- uses: VirtusLab/scala-cli-setup@5b1a6c5ca98b5642996812781f6ad9b2d5935f85
116116
with:
117117
jvm: "temurin:17"
118118
- name: JVM integration tests
@@ -137,7 +137,7 @@ jobs:
137137
with:
138138
fetch-depth: 0
139139
submodules: true
140-
- uses: VirtusLab/scala-cli-setup@6e130d1f4a0d65d57b354dd58cd3de8a60c264d7
140+
- uses: VirtusLab/scala-cli-setup@5b1a6c5ca98b5642996812781f6ad9b2d5935f85
141141
with:
142142
jvm: "temurin:17"
143143
- name: Generate native launcher
@@ -164,7 +164,7 @@ jobs:
164164
with:
165165
fetch-depth: 0
166166
submodules: true
167-
- uses: VirtusLab/scala-cli-setup@6e130d1f4a0d65d57b354dd58cd3de8a60c264d7
167+
- uses: VirtusLab/scala-cli-setup@5b1a6c5ca98b5642996812781f6ad9b2d5935f85
168168
with:
169169
jvm: "temurin:17"
170170
- uses: actions/download-artifact@v3
@@ -197,7 +197,7 @@ jobs:
197197
with:
198198
fetch-depth: 0
199199
submodules: true
200-
- uses: VirtusLab/scala-cli-setup@6e130d1f4a0d65d57b354dd58cd3de8a60c264d7
200+
- uses: VirtusLab/scala-cli-setup@5b1a6c5ca98b5642996812781f6ad9b2d5935f85
201201
with:
202202
jvm: "temurin:17"
203203
- uses: actions/download-artifact@v3
@@ -230,7 +230,7 @@ jobs:
230230
with:
231231
fetch-depth: 0
232232
submodules: true
233-
- uses: VirtusLab/scala-cli-setup@6e130d1f4a0d65d57b354dd58cd3de8a60c264d7
233+
- uses: VirtusLab/scala-cli-setup@5b1a6c5ca98b5642996812781f6ad9b2d5935f85
234234
with:
235235
jvm: "temurin:17"
236236
- uses: actions/download-artifact@v3
@@ -262,7 +262,7 @@ jobs:
262262
with:
263263
fetch-depth: 0
264264
submodules: true
265-
- uses: VirtusLab/scala-cli-setup@6e130d1f4a0d65d57b354dd58cd3de8a60c264d7
265+
- uses: VirtusLab/scala-cli-setup@5b1a6c5ca98b5642996812781f6ad9b2d5935f85
266266
with:
267267
apps: ""
268268
- name: Generate native launcher and generate os packages
@@ -285,7 +285,7 @@ jobs:
285285
with:
286286
fetch-depth: 0
287287
submodules: true
288-
- uses: VirtusLab/scala-cli-setup@6e130d1f4a0d65d57b354dd58cd3de8a60c264d7
288+
- uses: VirtusLab/scala-cli-setup@5b1a6c5ca98b5642996812781f6ad9b2d5935f85
289289
with:
290290
jvm: "temurin:17"
291291
- name: Generate native launcher
@@ -312,7 +312,7 @@ jobs:
312312
with:
313313
fetch-depth: 0
314314
submodules: true
315-
- uses: VirtusLab/scala-cli-setup@6e130d1f4a0d65d57b354dd58cd3de8a60c264d7
315+
- uses: VirtusLab/scala-cli-setup@5b1a6c5ca98b5642996812781f6ad9b2d5935f85
316316
with:
317317
jvm: "temurin:17"
318318
- uses: actions/download-artifact@v3
@@ -345,7 +345,7 @@ jobs:
345345
with:
346346
fetch-depth: 0
347347
submodules: true
348-
- uses: VirtusLab/scala-cli-setup@6e130d1f4a0d65d57b354dd58cd3de8a60c264d7
348+
- uses: VirtusLab/scala-cli-setup@5b1a6c5ca98b5642996812781f6ad9b2d5935f85
349349
with:
350350
jvm: "temurin:17"
351351
- uses: actions/download-artifact@v3
@@ -378,7 +378,7 @@ jobs:
378378
with:
379379
fetch-depth: 0
380380
submodules: true
381-
- uses: VirtusLab/scala-cli-setup@6e130d1f4a0d65d57b354dd58cd3de8a60c264d7
381+
- uses: VirtusLab/scala-cli-setup@5b1a6c5ca98b5642996812781f6ad9b2d5935f85
382382
with:
383383
jvm: "temurin:17"
384384
- uses: actions/download-artifact@v3
@@ -440,9 +440,10 @@ jobs:
440440
with:
441441
fetch-depth: 0
442442
submodules: true
443-
- uses: coursier/setup-action@48280172a2c999022e42527711d6b28e4945e6f0
443+
- uses: VirtusLab/scala-cli-setup@5b1a6c5ca98b5642996812781f6ad9b2d5935f85
444+
env:
445+
COURSIER_BIN_DIR: ${{ github.workspace }}/cs/bin # necessary for our M1 runner setup
444446
with:
445-
apps: "scala-cli"
446447
jvm: "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java17-darwin-aarch64-22.2.0.tar.gz"
447448
- uses: actions/download-artifact@v3
448449
with:
@@ -472,7 +473,7 @@ jobs:
472473
with:
473474
fetch-depth: 0
474475
submodules: true
475-
- uses: VirtusLab/scala-cli-setup@6e130d1f4a0d65d57b354dd58cd3de8a60c264d7
476+
- uses: VirtusLab/scala-cli-setup@5b1a6c5ca98b5642996812781f6ad9b2d5935f85
476477
with:
477478
jvm: "temurin:17"
478479
- name: Get latest coursier launcher
@@ -508,7 +509,7 @@ jobs:
508509
uses: actions/setup-python@v4
509510
with:
510511
python-version: "3.10"
511-
- uses: VirtusLab/scala-cli-setup@6e130d1f4a0d65d57b354dd58cd3de8a60c264d7
512+
- uses: VirtusLab/scala-cli-setup@5b1a6c5ca98b5642996812781f6ad9b2d5935f85
512513
with:
513514
jvm: "temurin:17"
514515
- name: Get latest coursier launcher
@@ -549,7 +550,7 @@ jobs:
549550
uses: actions/setup-python@v4
550551
with:
551552
python-version: "3.10"
552-
- uses: VirtusLab/scala-cli-setup@6e130d1f4a0d65d57b354dd58cd3de8a60c264d7
553+
- uses: VirtusLab/scala-cli-setup@5b1a6c5ca98b5642996812781f6ad9b2d5935f85
553554
with:
554555
jvm: "temurin:17"
555556
- name: Get latest coursier launcher
@@ -590,7 +591,7 @@ jobs:
590591
uses: actions/setup-python@v4
591592
with:
592593
python-version: "3.10"
593-
- uses: VirtusLab/scala-cli-setup@6e130d1f4a0d65d57b354dd58cd3de8a60c264d7
594+
- uses: VirtusLab/scala-cli-setup@5b1a6c5ca98b5642996812781f6ad9b2d5935f85
594595
with:
595596
jvm: "temurin:17"
596597
- name: Get latest coursier launcher
@@ -626,7 +627,7 @@ jobs:
626627
with:
627628
fetch-depth: 0
628629
submodules: true
629-
- uses: VirtusLab/scala-cli-setup@6e130d1f4a0d65d57b354dd58cd3de8a60c264d7
630+
- uses: VirtusLab/scala-cli-setup@5b1a6c5ca98b5642996812781f6ad9b2d5935f85
630631
with:
631632
jvm: "temurin:17"
632633
- name: Generate native launcher
@@ -650,7 +651,7 @@ jobs:
650651
with:
651652
fetch-depth: 0
652653
submodules: true
653-
- uses: VirtusLab/scala-cli-setup@6e130d1f4a0d65d57b354dd58cd3de8a60c264d7
654+
- uses: VirtusLab/scala-cli-setup@5b1a6c5ca98b5642996812781f6ad9b2d5935f85
654655
with:
655656
jvm: "temurin:17"
656657
- uses: actions/download-artifact@v3
@@ -697,7 +698,7 @@ jobs:
697698
with:
698699
fetch-depth: 0
699700
submodules: true
700-
- uses: VirtusLab/scala-cli-setup@6e130d1f4a0d65d57b354dd58cd3de8a60c264d7
701+
- uses: VirtusLab/scala-cli-setup@5b1a6c5ca98b5642996812781f6ad9b2d5935f85
701702
with:
702703
jvm: "temurin:17"
703704
- uses: actions/download-artifact@v3
@@ -730,7 +731,7 @@ jobs:
730731
with:
731732
fetch-depth: 0
732733
submodules: true
733-
- uses: VirtusLab/scala-cli-setup@6e130d1f4a0d65d57b354dd58cd3de8a60c264d7
734+
- uses: VirtusLab/scala-cli-setup@5b1a6c5ca98b5642996812781f6ad9b2d5935f85
734735
with:
735736
jvm: "temurin:17"
736737
- uses: actions/download-artifact@v3
@@ -762,7 +763,7 @@ jobs:
762763
with:
763764
fetch-depth: 0
764765
submodules: true
765-
- uses: VirtusLab/scala-cli-setup@6e130d1f4a0d65d57b354dd58cd3de8a60c264d7
766+
- uses: VirtusLab/scala-cli-setup@5b1a6c5ca98b5642996812781f6ad9b2d5935f85
766767
with:
767768
jvm: "temurin:17"
768769
- name: Generate native launcher
@@ -786,7 +787,7 @@ jobs:
786787
with:
787788
fetch-depth: 0
788789
submodules: true
789-
- uses: VirtusLab/scala-cli-setup@6e130d1f4a0d65d57b354dd58cd3de8a60c264d7
790+
- uses: VirtusLab/scala-cli-setup@5b1a6c5ca98b5642996812781f6ad9b2d5935f85
790791
with:
791792
jvm: "temurin:17"
792793
- uses: actions/download-artifact@v3
@@ -833,7 +834,7 @@ jobs:
833834
with:
834835
fetch-depth: 0
835836
submodules: true
836-
- uses: VirtusLab/scala-cli-setup@6e130d1f4a0d65d57b354dd58cd3de8a60c264d7
837+
- uses: VirtusLab/scala-cli-setup@5b1a6c5ca98b5642996812781f6ad9b2d5935f85
837838
with:
838839
jvm: "temurin:17"
839840
- uses: actions/download-artifact@v3
@@ -868,7 +869,7 @@ jobs:
868869
with:
869870
fetch-depth: 0
870871
submodules: true
871-
- uses: VirtusLab/scala-cli-setup@6e130d1f4a0d65d57b354dd58cd3de8a60c264d7
872+
- uses: VirtusLab/scala-cli-setup@5b1a6c5ca98b5642996812781f6ad9b2d5935f85
872873
with:
873874
jvm: "temurin:17"
874875
- uses: actions/download-artifact@v3
@@ -902,7 +903,7 @@ jobs:
902903
with:
903904
fetch-depth: 0
904905
submodules: true
905-
- uses: VirtusLab/scala-cli-setup@6e130d1f4a0d65d57b354dd58cd3de8a60c264d7
906+
- uses: VirtusLab/scala-cli-setup@5b1a6c5ca98b5642996812781f6ad9b2d5935f85
906907
with:
907908
jvm: "zulu:17"
908909
- uses: actions/setup-node@v4
@@ -930,7 +931,7 @@ jobs:
930931
with:
931932
fetch-depth: 0
932933
submodules: true
933-
- uses: VirtusLab/scala-cli-setup@6e130d1f4a0d65d57b354dd58cd3de8a60c264d7
934+
- uses: VirtusLab/scala-cli-setup@5b1a6c5ca98b5642996812781f6ad9b2d5935f85
934935
with:
935936
jvm: "temurin:17"
936937
- name: Check Scala / Scala.js versions in doc
@@ -955,7 +956,7 @@ jobs:
955956
with:
956957
fetch-depth: 0
957958
submodules: true
958-
- uses: VirtusLab/scala-cli-setup@6e130d1f4a0d65d57b354dd58cd3de8a60c264d7
959+
- uses: VirtusLab/scala-cli-setup@5b1a6c5ca98b5642996812781f6ad9b2d5935f85
959960
with:
960961
jvm: "temurin:17"
961962
apps: scalafmt:3.0.0
@@ -969,7 +970,7 @@ jobs:
969970
with:
970971
fetch-depth: 0
971972
submodules: true
972-
- uses: VirtusLab/scala-cli-setup@6e130d1f4a0d65d57b354dd58cd3de8a60c264d7
973+
- uses: VirtusLab/scala-cli-setup@5b1a6c5ca98b5642996812781f6ad9b2d5935f85
973974
with:
974975
jvm: "temurin:17"
975976
- name: Check that reference doc is up-to-date
@@ -989,7 +990,7 @@ jobs:
989990
with:
990991
fetch-depth: 0
991992
submodules: true
992-
- uses: VirtusLab/scala-cli-setup@6e130d1f4a0d65d57b354dd58cd3de8a60c264d7
993+
- uses: VirtusLab/scala-cli-setup@5b1a6c5ca98b5642996812781f6ad9b2d5935f85
993994
with:
994995
jvm: "temurin:17"
995996
- name: Java Version
@@ -1011,7 +1012,7 @@ jobs:
10111012
with:
10121013
fetch-depth: 0
10131014
submodules: true
1014-
- uses: VirtusLab/scala-cli-setup@6e130d1f4a0d65d57b354dd58cd3de8a60c264d7
1015+
- uses: VirtusLab/scala-cli-setup@5b1a6c5ca98b5642996812781f6ad9b2d5935f85
10151016
with:
10161017
jvm: "temurin:17"
10171018
- name: Try to export to SBT
@@ -1026,7 +1027,7 @@ jobs:
10261027
with:
10271028
fetch-depth: 0
10281029
submodules: true
1029-
- uses: VirtusLab/scala-cli-setup@6e130d1f4a0d65d57b354dd58cd3de8a60c264d7
1030+
- uses: VirtusLab/scala-cli-setup@5b1a6c5ca98b5642996812781f6ad9b2d5935f85
10301031
with:
10311032
jvm: "temurin:17"
10321033
- run: ./mill -i ci.copyVcRedist
@@ -1047,7 +1048,7 @@ jobs:
10471048
fetch-depth: 0
10481049
submodules: true
10491050
ssh-key: ${{ secrets.SSH_PRIVATE_KEY_SCALA_CLI }}
1050-
- uses: VirtusLab/scala-cli-setup@6e130d1f4a0d65d57b354dd58cd3de8a60c264d7
1051+
- uses: VirtusLab/scala-cli-setup@5b1a6c5ca98b5642996812781f6ad9b2d5935f85
10511052
with:
10521053
jvm: "temurin:17"
10531054
- name: GPG setup
@@ -1109,7 +1110,7 @@ jobs:
11091110
with:
11101111
fetch-depth: 0
11111112
submodules: true
1112-
- uses: VirtusLab/scala-cli-setup@6e130d1f4a0d65d57b354dd58cd3de8a60c264d7
1113+
- uses: VirtusLab/scala-cli-setup@5b1a6c5ca98b5642996812781f6ad9b2d5935f85
11131114
with:
11141115
jvm: "temurin:17"
11151116
- run: ./mill -i ci.setShouldPublish
@@ -1168,7 +1169,7 @@ jobs:
11681169
with:
11691170
fetch-depth: 0
11701171
submodules: true
1171-
- uses: VirtusLab/scala-cli-setup@6e130d1f4a0d65d57b354dd58cd3de8a60c264d7
1172+
- uses: VirtusLab/scala-cli-setup@5b1a6c5ca98b5642996812781f6ad9b2d5935f85
11721173
with:
11731174
jvm: "temurin:17"
11741175
- uses: actions/download-artifact@v3
@@ -1251,7 +1252,7 @@ jobs:
12511252
with:
12521253
fetch-depth: 0
12531254
submodules: true
1254-
- uses: VirtusLab/scala-cli-setup@6e130d1f4a0d65d57b354dd58cd3de8a60c264d7
1255+
- uses: VirtusLab/scala-cli-setup@5b1a6c5ca98b5642996812781f6ad9b2d5935f85
12551256
with:
12561257
jvm: "temurin:17"
12571258
- uses: actions/download-artifact@v3

0 commit comments

Comments
 (0)