From 432c177b3dcd4f13463130366e3411b1a5963671 Mon Sep 17 00:00:00 2001
From: "dwolla-oss-scala-steward[bot]"
<212073+dwolla-oss-scala-steward[bot]@users.noreply.github.com>
Date: Sat, 18 Jan 2025 00:31:06 +0000
Subject: [PATCH 1/2] Update sbt-typelevel-ci-release, ... to 0.7.6
---
project/plugins.sbt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 19c5cea46..9abea22ca 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,7 +1,7 @@
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
-addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.7.4")
-addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.7.4")
-addSbtPlugin("org.typelevel" % "sbt-typelevel-settings" % "0.7.4")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.7.6")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.7.6")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-settings" % "0.7.6")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.13.0")
addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.10.0")
From cc5f9648a5c2784c299857c7183ae3fc4302e877 Mon Sep 17 00:00:00 2001
From: "dwolla-oss-scala-steward[bot]"
<212073+dwolla-oss-scala-steward[bot]@users.noreply.github.com>
Date: Sat, 18 Jan 2025 00:31:28 +0000
Subject: [PATCH 2/2] Regenerate GitHub Actions workflow
Executed command: sbt githubWorkflowGenerate
---
.github/workflows/ci.yml | 32 ++++++++++++++++----------------
.mergify.yml | 4 ++--
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b27ac7ad3..86afa09f3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,23 +24,23 @@ concurrency:
jobs:
build:
- name: Build and Test
+ name: Test
strategy:
matrix:
- os: [ubuntu-latest]
+ os: [ubuntu-22.04]
scala: [per-project-matrix]
java: [temurin@8]
runs-on: ${{ matrix.os }}
timeout-minutes: 60
steps:
- - name: Install sbt
- uses: sbt/setup-sbt@v1
-
- name: Checkout current branch (full)
uses: actions/checkout@v4
with:
fetch-depth: 0
+ - name: Setup sbt
+ uses: sbt/setup-sbt@v1
+
- name: Setup Java (temurin@8)
id: setup-java-temurin-8
if: matrix.java == 'temurin@8'
@@ -61,11 +61,11 @@ jobs:
run: sbt test
- name: Check binary compatibility
- if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
+ if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04'
run: sbt mimaReportBinaryIssues
- name: Generate API documentation
- if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
+ if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04'
run: sbt doc
- name: Make target directories
@@ -89,18 +89,18 @@ jobs:
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
strategy:
matrix:
- os: [ubuntu-latest]
+ os: [ubuntu-22.04]
java: [temurin@8]
runs-on: ${{ matrix.os }}
steps:
- - name: Install sbt
- uses: sbt/setup-sbt@v1
-
- name: Checkout current branch (full)
uses: actions/checkout@v4
with:
fetch-depth: 0
+ - name: Setup sbt
+ uses: sbt/setup-sbt@v1
+
- name: Setup Java (temurin@8)
id: setup-java-temurin-8
if: matrix.java == 'temurin@8'
@@ -153,18 +153,18 @@ jobs:
if: github.event.repository.fork == false && github.event_name != 'pull_request'
strategy:
matrix:
- os: [ubuntu-latest]
+ os: [ubuntu-22.04]
java: [temurin@8]
runs-on: ${{ matrix.os }}
steps:
- - name: Install sbt
- uses: sbt/setup-sbt@v1
-
- name: Checkout current branch (full)
uses: actions/checkout@v4
with:
fetch-depth: 0
+ - name: Setup sbt
+ uses: sbt/setup-sbt@v1
+
- name: Setup Java (temurin@8)
id: setup-java-temurin-8
if: matrix.java == 'temurin@8'
@@ -187,7 +187,7 @@ jobs:
name: Validate Steward Config
strategy:
matrix:
- os: [ubuntu-latest]
+ os: [ubuntu-22.04]
java: [temurin@11]
runs-on: ${{ matrix.os }}
steps:
diff --git a/.mergify.yml b/.mergify.yml
index efc7fc616..b8cc91db7 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -12,8 +12,8 @@ pull_request_rules:
- or:
- body~=labels:.*early-semver-patch
- body~=labels:.*early-semver-minor
- - status-success=Build and Test (ubuntu-latest, per-project-matrix, temurin@8)
- - status-success=Validate Steward Config (ubuntu-latest, temurin@11)
+ - status-success=Test (ubuntu-22.04, per-project-matrix, temurin@8)
+ - status-success=Validate Steward Config (ubuntu-22.04, temurin@11)
actions:
merge: {}
- name: Label core PRs