Merge pull request #541 from typelevel/pr/oses

Add macos and windows to ci

Author: armanbilge

.github/workflows/ci.yml

@@ -27,7 +27,7 @@ jobs:
     name: Build and Test
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-latest, macos-latest, windows-latest]
         scala: [2.12]
         java:
           - temurin@8
@@ -36,9 +36,31 @@ jobs:
           - graalvm@17
           - corretto@17
         project: [sbt-typelevelJVM]
+        exclude:
+          - java: temurin@11
+            os: macos-latest
+          - java: temurin@11
+            os: windows-latest
+          - java: temurin@17
+            os: macos-latest
+          - java: temurin@17
+            os: windows-latest
+          - java: graalvm@17
+            os: macos-latest
+          - java: graalvm@17
+            os: windows-latest
+          - java: corretto@17
+            os: macos-latest
+          - java: corretto@17
+            os: windows-latest
     runs-on: ${{ matrix.os }}
     timeout-minutes: 60
     steps:
+      - name: Ignore line ending differences in git
+        if: contains(runner.os, 'windows')
+        shell: bash
+        run: git config --global core.autocrlf false
+
       - name: Checkout current branch (full)
         uses: actions/checkout@v3
         with:
@@ -55,6 +77,7 @@ jobs:
 
       - name: sbt update
         if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
+        shell: bash
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' reload +update
 
       - name: Setup Java (temurin@11)
@@ -68,6 +91,7 @@ jobs:
 
       - name: sbt update
         if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false'
+        shell: bash
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' reload +update
 
       - name: Setup Java (temurin@17)
@@ -81,6 +105,7 @@ jobs:
 
       - name: sbt update
         if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
+        shell: bash
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' reload +update
 
       - name: Setup Java (graalvm@17)
@@ -94,6 +119,7 @@ jobs:
 
       - name: sbt update
         if: matrix.java == 'graalvm@17' && steps.setup-java-graalvm-17.outputs.cache-hit == 'false'
+        shell: bash
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' reload +update
 
       - name: Setup Java (corretto@17)
@@ -107,36 +133,45 @@ jobs:
 
       - name: sbt update
         if: matrix.java == 'corretto@17' && steps.setup-java-corretto-17.outputs.cache-hit == 'false'
+        shell: bash
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' reload +update
 
       - name: Check that workflows are up to date
+        shell: bash
         run: sbt githubWorkflowCheck
 
       - name: Check headers and formatting
         if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
+        shell: bash
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck
 
       - name: Check scalafix lints
         if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
+        shell: bash
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' 'scalafixAll --check'
 
       - name: Test
+        shell: bash
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test
 
       - name: Check binary compatibility
         if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
+        shell: bash
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' mimaReportBinaryIssues
 
       - name: Generate API documentation
         if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
+        shell: bash
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' doc
 
       - name: Make target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
+        shell: bash
         run: mkdir -p github/target github-actions/target kernel/target versioning/target ci-release/target scalafix/target site/target ci-signing/target mergify/target unidoc/target mima/target no-publish/target sonatype/target ci/target sonatype-ci-release/target core/target settings/target project/target
 
       - name: Compress target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
+        shell: bash
         run: tar cf targets.tar github/target github-actions/target kernel/target versioning/target ci-release/target scalafix/target site/target ci-signing/target mergify/target unidoc/target mima/target no-publish/target sonatype/target ci/target sonatype-ci-release/target core/target settings/target project/target
 
       - name: Upload target directories
@@ -157,6 +192,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     timeout-minutes: 45
     steps:
+      - name: Ignore line ending differences in git
+        if: contains(runner.os, 'windows')
+        run: git config --global core.autocrlf false
+
       - name: Checkout current branch (full)
         uses: actions/checkout@v3
         with:
@@ -270,6 +309,10 @@ jobs:
         java: [temurin@8]
     runs-on: ${{ matrix.os }}
     steps:
+      - name: Ignore line ending differences in git
+        if: contains(runner.os, 'windows')
+        run: git config --global core.autocrlf false
+
       - name: Checkout current branch (full)
         uses: actions/checkout@v3
         with:
@@ -370,6 +413,10 @@ jobs:
         java: [temurin@8]
     runs-on: ${{ matrix.os }}
     steps:
+      - name: Ignore line ending differences in git
+        if: contains(runner.os, 'windows')
+        run: git config --global core.autocrlf false
+
       - name: Checkout current branch (full)
         uses: actions/checkout@v3
         with:

.mergify.yml

@@ -17,6 +17,8 @@ pull_request_rules:
   - status-success=Build and Test (ubuntu-latest, 2.12, temurin@17, sbt-typelevelJVM)
   - status-success=Build and Test (ubuntu-latest, 2.12, graalvm@17, sbt-typelevelJVM)
   - status-success=Build and Test (ubuntu-latest, 2.12, corretto@17, sbt-typelevelJVM)
+  - status-success=Build and Test (macos-latest, 2.12, temurin@8, sbt-typelevelJVM)
+  - status-success=Build and Test (windows-latest, 2.12, temurin@8, sbt-typelevelJVM)
   - status-success=Validate Steward Config (ubuntu-latest)
   - status-success=Generate Site (ubuntu-latest, temurin@8)
   - '#approved-reviews-by>=1'

build.sbt

@@ -18,6 +18,15 @@ ThisBuild / githubWorkflowJavaVersions ++= Seq(
   JavaSpec.corretto("17")
 )
 
+ThisBuild / githubWorkflowOSes ++= Seq("macos-latest", "windows-latest")
+
+ThisBuild / githubWorkflowBuildMatrixExclusions ++= {
+  for {
+    java <- githubWorkflowJavaVersions.value.tail
+    os <- githubWorkflowOSes.value.tail
+  } yield MatrixExclude(Map("java" -> java.render, "os" -> os))
+}
+
 ThisBuild / githubWorkflowPublishTimeoutMinutes := Some(45)
 
 ThisBuild / mergifyStewardConfig ~= {

site/src/main/scala/org/typelevel/sbt/TypelevelSitePlugin.scala

@@ -168,12 +168,16 @@ object TypelevelSitePlugin extends AutoPlugin {
             UseRef.Public("peaceiris", "actions-gh-pages", "v3.9.3"),
             Map(
               "github_token" -> s"$${{ secrets.GITHUB_TOKEN }}",
-              "publish_dir" -> (ThisBuild / baseDirectory)
-                .value
-                .toPath
-                .toAbsolutePath
-                .relativize((laikaSite / target).value.toPath)
-                .toString,
+              "publish_dir" -> {
+                val path = (ThisBuild / baseDirectory)
+                  .value
+                  .toPath
+                  .toAbsolutePath
+                  .relativize((laikaSite / target).value.toPath)
+
+                // os-independent path rendering ...
+                (0 until path.getNameCount).map(path.getName).mkString("/")
+              },
               "keep_files" -> tlSiteKeepFiles.value.toString
             ),
             name = Some("Publish site"),