Merge pull request #796 from Dwolla/update/sbt-typelevel-ci-release-0…

….7.7 Update sbt-typelevel-ci-release, ... to 0.7.7
Dwolla · Jan 29, 2025 · bbaf0a1 · bbaf0a1
2 parents 96b1a76 + 5574a7a
commit bbaf0a1
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 26 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,10 +24,10 @@ concurrency:
 
 jobs:
   build:
-    name: Build and Test
+    name: Test
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-22.04]
         scala: [3, 2.13, 2.12]
         java: [temurin@8, temurin@11]
         project: [fs2-awsJS, fs2-awsJVM]
@@ -37,14 +37,14 @@ jobs:
     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'
@@ -97,18 +97,18 @@ jobs:
     if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/3.x')
     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'
@@ -224,18 +224,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'

diff --git a/.mergify.yml b/.mergify.yml
@@ -12,15 +12,15 @@ pull_request_rules:
   - or:
     - body~=labels:.*early-semver-patch
     - body~=labels:.*early-semver-minor
-  - status-success=Build and Test (ubuntu-latest, 3, temurin@8, fs2-awsJS)
-  - status-success=Build and Test (ubuntu-latest, 3, temurin@8, fs2-awsJVM)
-  - status-success=Build and Test (ubuntu-latest, 3, temurin@11, fs2-awsJVM)
-  - status-success=Build and Test (ubuntu-latest, 2.13, temurin@8, fs2-awsJS)
-  - status-success=Build and Test (ubuntu-latest, 2.13, temurin@8, fs2-awsJVM)
-  - status-success=Build and Test (ubuntu-latest, 2.13, temurin@11, fs2-awsJVM)
-  - status-success=Build and Test (ubuntu-latest, 2.12, temurin@8, fs2-awsJS)
-  - status-success=Build and Test (ubuntu-latest, 2.12, temurin@8, fs2-awsJVM)
-  - status-success=Build and Test (ubuntu-latest, 2.12, temurin@11, fs2-awsJVM)
+  - status-success=Test (ubuntu-22.04, 3, temurin@8, fs2-awsJS)
+  - status-success=Test (ubuntu-22.04, 3, temurin@8, fs2-awsJVM)
+  - status-success=Test (ubuntu-22.04, 3, temurin@11, fs2-awsJVM)
+  - status-success=Test (ubuntu-22.04, 2.13, temurin@8, fs2-awsJS)
+  - status-success=Test (ubuntu-22.04, 2.13, temurin@8, fs2-awsJVM)
+  - status-success=Test (ubuntu-22.04, 2.13, temurin@11, fs2-awsJVM)
+  - status-success=Test (ubuntu-22.04, 2.12, temurin@8, fs2-awsJS)
+  - status-success=Test (ubuntu-22.04, 2.12, temurin@8, fs2-awsJVM)
+  - status-success=Test (ubuntu-22.04, 2.12, temurin@11, fs2-awsJVM)
   actions:
     merge: {}
 - name: Label core PRs

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,10 +1,10 @@
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")
 addSbtPlugin("org.portable-scala" % "sbt-crossproject" % "1.3.2")
 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-settings" % "0.7.4")
-addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.7.4")
-addSbtPlugin("org.typelevel" % "sbt-typelevel-no-publish" % "0.7.4")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.7.7")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-settings" % "0.7.7")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.7.7")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-no-publish" % "0.7.7")
 
 
 addSbtPlugin("org.scalablytyped.converter" % "sbt-converter" % "1.0.0-beta44")