Skip to content

Commit c8fef9d

Browse files
committed
Ensure macos jobs are running on the correct architecture on the CI
1 parent 9b666ba commit c8fef9d

File tree

1 file changed

+20
-3
lines changed

1 file changed

+20
-3
lines changed

.github/workflows/ci.yml

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,9 @@ jobs:
380380
submodules: true
381381
- uses: VirtusLab/scala-cli-setup@v1
382382
with:
383-
apps: ""
383+
jvm: "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java17-darwin-aarch64-22.2.0.tar.gz"
384+
- name: Ensure it's running on aarch64
385+
run: scala-cli -e 'assert(System.getProperty("os.arch") == "aarch64")'
384386
- name: Generate native launcher and generate os packages
385387
run: .github/scripts/build-linux-aarch64.sh
386388
env:
@@ -404,6 +406,8 @@ jobs:
404406
- uses: VirtusLab/scala-cli-setup@v1
405407
with:
406408
jvm: "temurin:17"
409+
- name: Ensure it's not running on aarch64
410+
run: scala-cli -e 'assert(System.getProperty("os.arch") != "aarch64")'
407411
- name: Generate native launcher
408412
run: .github/scripts/generate-native-image.sh
409413
- run: ./mill -i ci.setShouldPublish
@@ -431,6 +435,8 @@ jobs:
431435
- uses: VirtusLab/scala-cli-setup@v1
432436
with:
433437
jvm: "temurin:17"
438+
- name: Ensure it's not running on aarch64
439+
run: scala-cli -e 'assert(System.getProperty("os.arch") != "aarch64")'
434440
- uses: actions/download-artifact@v3
435441
with:
436442
name: macos-launchers
@@ -464,6 +470,8 @@ jobs:
464470
- uses: VirtusLab/scala-cli-setup@v1
465471
with:
466472
jvm: "temurin:17"
473+
- name: Ensure it's not running on aarch64
474+
run: scala-cli -e 'assert(System.getProperty("os.arch") != "aarch64")'
467475
- uses: actions/download-artifact@v3
468476
with:
469477
name: macos-launchers
@@ -497,6 +505,8 @@ jobs:
497505
- uses: VirtusLab/scala-cli-setup@v1
498506
with:
499507
jvm: "temurin:17"
508+
- name: Ensure it's not running on aarch64
509+
run: scala-cli -e 'assert(System.getProperty("os.arch") != "aarch64")'
500510
- uses: actions/download-artifact@v3
501511
with:
502512
name: macos-launchers
@@ -530,6 +540,8 @@ jobs:
530540
- uses: VirtusLab/scala-cli-setup@v1
531541
with:
532542
jvm: "temurin:17"
543+
- name: Ensure it's not running on aarch64
544+
run: scala-cli -e 'assert(System.getProperty("os.arch") != "aarch64")'
533545
- uses: actions/download-artifact@v3
534546
with:
535547
name: macos-launchers
@@ -563,6 +575,8 @@ jobs:
563575
- uses: VirtusLab/scala-cli-setup@v1
564576
with:
565577
jvm: "temurin:17"
578+
- name: Ensure it's not running on aarch64
579+
run: scala-cli -e 'assert(System.getProperty("os.arch") != "aarch64")'
566580
- uses: actions/download-artifact@v3
567581
with:
568582
name: macos-launchers
@@ -593,10 +607,11 @@ jobs:
593607
with:
594608
fetch-depth: 0
595609
submodules: true
596-
- uses: coursier/setup-action@7bde40eee928896f074dbb76d22dd772eed5c65f
610+
- uses: VirtusLab/scala-cli-setup@v1
597611
with:
598-
apps: ""
599612
jvm: "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java17-darwin-aarch64-22.2.0.tar.gz"
613+
- name: Ensure it's running on aarch64
614+
run: scala-cli -e 'assert(System.getProperty("os.arch") == "aarch64")'
600615
- name: Generate native launcher
601616
run: .github/scripts/generate-native-image.sh
602617
- run: ./mill -i ci.setShouldPublish
@@ -627,6 +642,8 @@ jobs:
627642
COURSIER_BIN_DIR: ${{ github.workspace }}/cs/bin # necessary for our M1 runner setup
628643
with:
629644
jvm: "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java17-darwin-aarch64-22.2.0.tar.gz"
645+
- name: Ensure it's running on aarch64
646+
run: scala-cli -e 'assert(System.getProperty("os.arch") == "aarch64")'
630647
- uses: actions/download-artifact@v3
631648
with:
632649
name: macos-m1-launchers

0 commit comments

Comments
 (0)