Use ubuntu-latest

gemini-hlsw · Mar 18, 2024 · eea2987 · eea2987
1 parent aa67a19
commit eea2987
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,7 +27,7 @@ jobs:
     name: Build and Test
     strategy:
       matrix:
-        os: [macos-latest]
+        os: [ubuntu-latest]
         scala: [3]
         java: [temurin@17]
         project: [rootJS, rootJVM]
@@ -74,11 +74,11 @@ jobs:
         run: sbt -v -J-Xmx6g githubWorkflowCheck
 
       - name: Check headers and formatting
-        if: matrix.java == 'temurin@17' && matrix.os == 'macos-latest'
+        if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest'
         run: sbt -v -J-Xmx6g 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck lucumaScalafmtCheck lucumaScalafixCheck
 
       - name: Check scalafix lints
-        if: matrix.java == 'temurin@17' && matrix.os == 'macos-latest'
+        if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest'
         run: sbt -v -J-Xmx6g 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' 'scalafixAll --check'
 
       - name: scalaJSLink

diff --git a/.mergify.yml b/.mergify.yml
@@ -13,8 +13,8 @@ pull_request_rules:
     - body~=labels:.*early-semver-patch
     - body~=labels:.*early-semver-minor
     - 'title=flake.lock: Update'
-  - status-success=Build and Test (macos-latest, 3, temurin@17, rootJS)
-  - status-success=Build and Test (macos-latest, 3, temurin@17, rootJVM)
+  - status-success=Build and Test (ubuntu-latest, 3, temurin@17, rootJS)
+  - status-success=Build and Test (ubuntu-latest, 3, temurin@17, rootJVM)
   actions:
     merge: {}
 - name: Label common PRs

diff --git a/build.sbt b/build.sbt
@@ -360,7 +360,6 @@ ThisBuild / githubWorkflowGeneratedUploadSteps := Seq.empty
 ThisBuild / githubWorkflowSbtCommand           := "sbt -v -J-Xmx6g"
 ThisBuild / githubWorkflowBuildPreamble ++= setupNodeNpmInstall
 ThisBuild / githubWorkflowEnv += faNpmAuthToken
-ThisBuild / githubWorkflowOSes                 := Seq("macos-latest")
 
 ThisBuild / githubWorkflowAddedJobs +=
   WorkflowJob(
@@ -378,7 +377,6 @@ ThisBuild / githubWorkflowAddedJobs +=
       Nil,
     scalas = List(scalaVersion.value),
     javas = githubWorkflowJavaVersions.value.toList.take(1),
-    oses = List("macos-latest"),
     cond = Some(allConds(anyConds(masterCond, prCond), geminiRepoCond))
   )