Skip to content

Commit f4653b5

Browse files
GedochaoGedochao
authored
Merge pull request #3885 from Gedochao/maintenance/macos-gh-workflows
Update MacOS CI
2 parents 4f21828 + f4250f9 commit f4653b5

File tree

2 files changed

+14
-125
lines changed

2 files changed

+14
-125
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 9 additions & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ jobs:
439439

440440
generate-macos-launcher:
441441
timeout-minutes: 120
442-
runs-on: "macOS-13"
442+
runs-on: "macOS-15-intel"
443443
steps:
444444
- uses: actions/checkout@v5
445445
with:
@@ -468,7 +468,7 @@ jobs:
468468
native-macos-tests-1:
469469
needs: generate-macos-launcher
470470
timeout-minutes: 120
471-
runs-on: "macOS-13"
471+
runs-on: "macOS-15-intel"
472472
steps:
473473
- uses: actions/checkout@v5
474474
with:
@@ -500,115 +500,10 @@ jobs:
500500
name: test-results-macos-tests-1
501501
path: test-report.xml
502502

503-
native-macos-tests-2:
504-
needs: generate-macos-launcher
505-
timeout-minutes: 120
506-
runs-on: "macOS-13"
507-
steps:
508-
- uses: actions/checkout@v5
509-
with:
510-
fetch-depth: 0
511-
submodules: true
512-
- uses: VirtusLab/scala-cli-setup@v1
513-
with:
514-
jvm: "temurin:17"
515-
- name: Ensure it's not running on aarch64
516-
run: scala-cli -e 'assert(System.getProperty("os.arch") != "aarch64")'
517-
- uses: actions/download-artifact@v5
518-
with:
519-
name: macos-launchers
520-
path: artifacts/
521-
- name: Native integration tests
522-
run: ./mill -i nativeIntegrationTests
523-
env:
524-
UPDATE_GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
525-
SCALA_CLI_IT_FORCED_LAUNCHER_DIRECTORY: artifacts/
526-
SCALA_CLI_IT_GROUP: 2
527-
SCALA_CLI_SODIUM_JNI_ALLOW: false
528-
- name: Convert Mill test reports to JUnit XML format
529-
if: success() || failure()
530-
run: .github/scripts/generate-junit-reports.sc macos-tests-2 'Scala CLI MacOS Tests (2)' test-report.xml out/
531-
- name: Upload test report
532-
uses: actions/upload-artifact@v4
533-
if: success() || failure()
534-
with:
535-
name: test-results-macos-tests-2
536-
path: test-report.xml
537-
538-
native-macos-tests-3:
539-
needs: generate-macos-launcher
540-
timeout-minutes: 120
541-
runs-on: "macOS-13"
542-
steps:
543-
- uses: actions/checkout@v5
544-
with:
545-
fetch-depth: 0
546-
submodules: true
547-
- uses: VirtusLab/scala-cli-setup@v1
548-
with:
549-
jvm: "temurin:17"
550-
- name: Ensure it's not running on aarch64
551-
run: scala-cli -e 'assert(System.getProperty("os.arch") != "aarch64")'
552-
- uses: actions/download-artifact@v5
553-
with:
554-
name: macos-launchers
555-
path: artifacts/
556-
- name: Native integration tests
557-
run: ./mill -i nativeIntegrationTests
558-
env:
559-
UPDATE_GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
560-
SCALA_CLI_IT_FORCED_LAUNCHER_DIRECTORY: artifacts/
561-
SCALA_CLI_IT_GROUP: 3
562-
SCALA_CLI_SODIUM_JNI_ALLOW: false
563-
- name: Convert Mill test reports to JUnit XML format
564-
if: success() || failure()
565-
run: .github/scripts/generate-junit-reports.sc macos-tests-3 'Scala CLI MacOS Tests (3)' test-report.xml out/
566-
- name: Upload test report
567-
uses: actions/upload-artifact@v4
568-
if: success() || failure()
569-
with:
570-
name: test-results-macos-tests-3
571-
path: test-report.xml
572-
573-
native-macos-tests-4:
574-
needs: generate-macos-launcher
575-
timeout-minutes: 120
576-
runs-on: "macOS-13"
577-
steps:
578-
- uses: actions/checkout@v5
579-
with:
580-
fetch-depth: 0
581-
submodules: true
582-
- uses: VirtusLab/scala-cli-setup@v1
583-
with:
584-
jvm: "temurin:17"
585-
- name: Ensure it's not running on aarch64
586-
run: scala-cli -e 'assert(System.getProperty("os.arch") != "aarch64")'
587-
- uses: actions/download-artifact@v5
588-
with:
589-
name: macos-launchers
590-
path: artifacts/
591-
- name: Native integration tests
592-
run: ./mill -i nativeIntegrationTests
593-
env:
594-
UPDATE_GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
595-
SCALA_CLI_IT_FORCED_LAUNCHER_DIRECTORY: artifacts/
596-
SCALA_CLI_IT_GROUP: 4
597-
SCALA_CLI_SODIUM_JNI_ALLOW: false
598-
- name: Convert Mill test reports to JUnit XML format
599-
if: success() || failure()
600-
run: .github/scripts/generate-junit-reports.sc macos-tests-4 'Scala CLI MacOS Tests (4)' test-report.xml out/
601-
- name: Upload test report
602-
uses: actions/upload-artifact@v4
603-
if: success() || failure()
604-
with:
605-
name: test-results-macos-tests-4
606-
path: test-report.xml
607-
608503
native-macos-tests-5:
609504
needs: generate-macos-launcher
610505
timeout-minutes: 120
611-
runs-on: "macOS-13"
506+
runs-on: "macOS-15-intel"
612507
steps:
613508
- uses: actions/checkout@v5
614509
with:
@@ -642,7 +537,7 @@ jobs:
642537

643538
generate-macos-m1-launcher:
644539
timeout-minutes: 120
645-
runs-on: "macOS-14"
540+
runs-on: "macOS-15"
646541
steps:
647542
- uses: actions/checkout@v5
648543
with:
@@ -671,7 +566,7 @@ jobs:
671566
native-macos-m1-tests-1:
672567
needs: generate-macos-m1-launcher
673568
timeout-minutes: 120
674-
runs-on: "macOS-14"
569+
runs-on: "macOS-15"
675570
steps:
676571
- uses: actions/checkout@v5
677572
with:
@@ -706,7 +601,7 @@ jobs:
706601
native-macos-m1-tests-2:
707602
needs: generate-macos-m1-launcher
708603
timeout-minutes: 120
709-
runs-on: "macOS-14"
604+
runs-on: "macOS-15"
710605
steps:
711606
- uses: actions/checkout@v5
712607
with:
@@ -741,7 +636,7 @@ jobs:
741636
native-macos-m1-tests-3:
742637
needs: generate-macos-m1-launcher
743638
timeout-minutes: 120
744-
runs-on: "macOS-14"
639+
runs-on: "macOS-15"
745640
steps:
746641
- uses: actions/checkout@v5
747642
with:
@@ -776,7 +671,7 @@ jobs:
776671
native-macos-m1-tests-4:
777672
needs: generate-macos-m1-launcher
778673
timeout-minutes: 120
779-
runs-on: "macOS-14"
674+
runs-on: "macOS-15"
780675
steps:
781676
- uses: actions/checkout@v5
782677
with:
@@ -811,7 +706,7 @@ jobs:
811706
native-macos-m1-tests-5:
812707
needs: generate-macos-m1-launcher
813708
timeout-minutes: 120
814-
runs-on: "macOS-14"
709+
runs-on: "macOS-15"
815710
steps:
816711
- uses: actions/checkout@v5
817712
with:
@@ -1649,9 +1544,6 @@ jobs:
16491544
- native-linux-tests-4
16501545
- native-linux-tests-5
16511546
- native-macos-tests-1
1652-
- native-macos-tests-2
1653-
- native-macos-tests-3
1654-
- native-macos-tests-4
16551547
- native-macos-tests-5
16561548
- native-macos-m1-tests-1
16571549
- native-macos-m1-tests-2
@@ -1737,9 +1629,6 @@ jobs:
17371629
- native-linux-tests-4
17381630
- native-linux-tests-5
17391631
- native-macos-tests-1
1740-
- native-macos-tests-2
1741-
- native-macos-tests-3
1742-
- native-macos-tests-4
17431632
- native-macos-tests-5
17441633
- native-macos-m1-tests-1
17451634
- native-macos-m1-tests-2

‎modules/integration/src/test/scala/scala/cli/integration/ScalaCliSuite.scala‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ abstract class ScalaCliSuite extends munit.FunSuite {
4646
object ScalaCliSuite {
4747
sealed abstract class TestGroup(val idx: Int) extends Product with Serializable
4848
object TestGroup {
49-
case object First extends TestGroup(1)
50-
case object Second extends TestGroup(2)
51-
case object Third extends TestGroup(3)
52-
case object Fourth extends TestGroup(4)
53-
case object Fifth extends TestGroup(5)
49+
case object First extends TestGroup(1) // Scala 3 Next / default
50+
case object Second extends TestGroup(2) // Scala 2.13
51+
case object Third extends TestGroup(3) // Scala 2.12
52+
case object Fourth extends TestGroup(4) // Scala 3.3 LTS
53+
case object Fifth extends TestGroup(5) // Scala 3 Next RC
5454
}
5555
}

0 commit comments

Comments
 (0)