Skip to content

Commit 885eb22

Browse files
authored
Merge pull request #762 from samspills/sam/pin-ubuntu-runner
pin to ubuntu-22.04 as default runner OS
2 parents a5a1496 + 6c62854 commit 885eb22

File tree

5 files changed

+21
-21
lines changed

5 files changed

+21
-21
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
name: Build and Test
4242
strategy:
4343
matrix:
44-
os: [ubuntu-latest, macos-latest, windows-latest]
44+
os: [ubuntu-22.04, macos-latest, windows-latest]
4545
scala: [2.12]
4646
java:
4747
- temurin@8
@@ -196,12 +196,12 @@ jobs:
196196
run: sbt githubWorkflowCheck
197197

198198
- name: Check headers and formatting
199-
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
199+
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04'
200200
shell: bash
201201
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck
202202

203203
- name: Check scalafix lints
204-
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
204+
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04'
205205
shell: bash
206206
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' 'scalafixAll --check'
207207

@@ -210,12 +210,12 @@ jobs:
210210
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test
211211

212212
- name: Check binary compatibility
213-
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
213+
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04'
214214
shell: bash
215215
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' mimaReportBinaryIssues
216216

217217
- name: Generate API documentation
218-
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
218+
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04'
219219
shell: bash
220220
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' doc
221221

@@ -246,7 +246,7 @@ jobs:
246246
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
247247
strategy:
248248
matrix:
249-
os: [ubuntu-latest]
249+
os: [ubuntu-22.04]
250250
java: [temurin@8]
251251
runs-on: ${{ matrix.os }}
252252
timeout-minutes: 45
@@ -393,7 +393,7 @@ jobs:
393393
if: github.event.repository.fork == false && github.event_name != 'pull_request'
394394
strategy:
395395
matrix:
396-
os: [ubuntu-latest]
396+
os: [ubuntu-22.04]
397397
java: [temurin@8]
398398
runs-on: ${{ matrix.os }}
399399
steps:
@@ -510,7 +510,7 @@ jobs:
510510
name: Validate Steward Config
511511
strategy:
512512
matrix:
513-
os: [ubuntu-latest]
513+
os: [ubuntu-22.04]
514514
java: [temurin@11]
515515
runs-on: ${{ matrix.os }}
516516
steps:
@@ -535,7 +535,7 @@ jobs:
535535
name: Generate Site
536536
strategy:
537537
matrix:
538-
os: [ubuntu-latest]
538+
os: [ubuntu-22.04]
539539
java: [temurin@11]
540540
runs-on: ${{ matrix.os }}
541541
steps:

.mergify.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ pull_request_rules:
1212
- or:
1313
- body~=labels:.*early-semver-patch
1414
- body~=labels:.*early-semver-minor
15-
- status-success=Build and Test (ubuntu-latest, 2.12, temurin@8, sbt-typelevelJVM)
16-
- status-success=Build and Test (ubuntu-latest, 2.12, temurin@11, sbt-typelevelJVM)
17-
- status-success=Build and Test (ubuntu-latest, 2.12, temurin@17, sbt-typelevelJVM)
18-
- status-success=Build and Test (ubuntu-latest, 2.12, graal_22.3.2@11, sbt-typelevelJVM)
19-
- status-success=Build and Test (ubuntu-latest, 2.12, graalvm@21, sbt-typelevelJVM)
20-
- status-success=Build and Test (ubuntu-latest, 2.12, corretto@17, sbt-typelevelJVM)
21-
- status-success=Build and Test (ubuntu-latest, 2.12, semeru@17, sbt-typelevelJVM)
15+
- status-success=Build and Test (ubuntu-22.04, 2.12, temurin@8, sbt-typelevelJVM)
16+
- status-success=Build and Test (ubuntu-22.04, 2.12, temurin@11, sbt-typelevelJVM)
17+
- status-success=Build and Test (ubuntu-22.04, 2.12, temurin@17, sbt-typelevelJVM)
18+
- status-success=Build and Test (ubuntu-22.04, 2.12, graal_22.3.2@11, sbt-typelevelJVM)
19+
- status-success=Build and Test (ubuntu-22.04, 2.12, graalvm@21, sbt-typelevelJVM)
20+
- status-success=Build and Test (ubuntu-22.04, 2.12, corretto@17, sbt-typelevelJVM)
21+
- status-success=Build and Test (ubuntu-22.04, 2.12, semeru@17, sbt-typelevelJVM)
2222
- status-success=Build and Test (macos-latest, 2.12, temurin@17, sbt-typelevelJVM)
2323
- status-success=Build and Test (windows-latest, 2.12, temurin@8, sbt-typelevelJVM)
24-
- status-success=Validate Steward Config (ubuntu-latest, temurin@11)
25-
- status-success=Generate Site (ubuntu-latest, temurin@11)
24+
- status-success=Validate Steward Config (ubuntu-22.04, temurin@11)
25+
- status-success=Generate Site (ubuntu-22.04, temurin@11)
2626
- '#approved-reviews-by>=1'
2727
actions:
2828
merge: {}

github-actions/src/main/scala/org/typelevel/sbt/gha/GenerativeKeys.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ trait GenerativeKeys {
8787
lazy val githubWorkflowScalaVersions = settingKey[Seq[String]](
8888
"A list of Scala versions on which to build the project (default: crossScalaVersions.value)")
8989
lazy val githubWorkflowOSes =
90-
settingKey[Seq[String]]("A list of OS names (default: [ubuntu-latest])")
90+
settingKey[Seq[String]]("A list of OS names (default: [ubuntu-22.04])")
9191

9292
lazy val githubWorkflowDependencyPatterns = settingKey[Seq[String]](
9393
"A list of file globes within the project which affect dependency information (default: [**/*.sbt, project/build.properties])")

github-actions/src/main/scala/org/typelevel/sbt/gha/GenerativePlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,7 @@ ${indent(jobs.map(compileJob(_, sbt)).mkString("\n\n"), 1)}
651651
else
652652
scalas
653653
},
654-
githubWorkflowOSes := Seq("ubuntu-latest"),
654+
githubWorkflowOSes := Seq("ubuntu-22.04"),
655655
githubWorkflowDependencyPatterns := Seq("**/*.sbt", "project/build.properties"),
656656
githubWorkflowTargetBranches := Seq("**"),
657657
githubWorkflowTargetTags := Seq(),

github-actions/src/main/scala/org/typelevel/sbt/gha/WorkflowJob.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ object WorkflowJob {
7474
cond: Option[String] = None,
7575
permissions: Option[Permissions] = None,
7676
env: Map[String, String] = Map(),
77-
oses: List[String] = List("ubuntu-latest"),
77+
oses: List[String] = List("ubuntu-22.04"),
7878
scalas: List[String] = List("2.13"),
7979
javas: List[JavaSpec] = List(JavaSpec.temurin("11")),
8080
needs: List[String] = List(),

0 commit comments

Comments
 (0)