ci(docs): Setup sbt in publish job

FunktionalIO · Jan 14, 2025 · 368fbf5 · 368fbf5
1 parent dadeb49
commit 368fbf5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,7 +24,7 @@ concurrency:
 
 jobs:
   build:
-    name: Build and Test
+    name: Test
     strategy:
       matrix:
         os: [ubuntu-latest]
@@ -33,14 +33,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 (graalvm@21)
         id: setup-java-graalvm-21
         if: matrix.java == 'graalvm@21'
@@ -100,14 +100,14 @@ jobs:
         java: [graalvm@21]
     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 (graalvm@21)
         id: setup-java-graalvm-21
         if: matrix.java == 'graalvm@21'
@@ -160,18 +160,18 @@ jobs:
     if: github.event.repository.fork == false && github.event_name != 'pull_request'
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-22.04]
         java: [graalvm@21]
     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 (graalvm@21)
         id: setup-java-graalvm-21
         if: matrix.java == 'graalvm@21'
@@ -194,7 +194,7 @@ jobs:
     name: Validate Steward Config
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-22.04]
         java: [temurin@11]
     runs-on: ${{ matrix.os }}
     steps:
@@ -341,6 +341,9 @@ jobs:
         if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
         run: sbt +update
 
+      - name: Setup sbt
+        uses: sbt/setup-sbt@v1
+
       - name: Install docToolchain
         run: ./dtcw local install doctoolchain
 

diff --git a/ci.sbt b/ci.sbt
@@ -94,6 +94,7 @@ val websitePublication = WorkflowJob(
   ) ++
       WorkflowStep.SetupJava(List(JavaSpec.temurin("17"))) ++
       List(
+        WorkflowStep.SetupSbt,
         WorkflowStep.Run(
           name = Some("Install docToolchain"),
           commands = List("./dtcw local install doctoolchain")

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,4 +1,4 @@
-addSbtPlugin("org.typelevel"            % "sbt-typelevel"             % "0.7.4")
+addSbtPlugin("org.typelevel"            % "sbt-typelevel"             % "0.7.5")
 // Build
 addSbtPlugin("com.timushev.sbt"         % "sbt-rewarn"                % "0.1.3")
 addSbtPlugin("com.github.cb372"         % "sbt-explicit-dependencies" % "0.3.1")