macos

sbt · Oct 12, 2024 · 1a1d0d1 · 1a1d0d1
1 parent 875a6e1
commit 1a1d0d1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,16 +10,19 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - java: 8
+          - os: ubuntu-latest
+            java: 8
             distribution: zulu
             jobtype: 1
-          - java: 8
+          - os: macos-latest
+            java: 8
             distribution: zulu
             jobtype: 2
-          - java: 8
+          - os: ubuntu-latest
+            java: 8
             distribution: zulu
             jobtype: 3
-    runs-on: ubuntu-22.04
+    runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
       with:

diff --git a/sbtdynver/src/sbt-test/dynver/custom-version-string/build.sbt b/sbtdynver/src/sbt-test/dynver/custom-version-string/build.sbt
@@ -10,10 +10,10 @@ def fallbackVersion(d: java.util.Date): String = s"HEAD-${sbtdynver.DynVer times
 
 inThisBuild(List(
   version := dynverGitDescribeOutput.value.mkVersion(versionFmt, fallbackVersion(dynverCurrentDate.value)),
-   dynver := {
-     val d = new java.util.Date
-     sbtdynver.DynVer.getGitDescribeOutput(d).mkVersion(versionFmt, fallbackVersion(d))
-   }
+  dynver := {
+    val d = new java.util.Date
+    sbtdynver.DynVer.getGitDescribeOutput(d).mkVersion(versionFmt, fallbackVersion(d))
+  }
 ))
 
 def tstamp = Def.setting(sbtdynver.DynVer timestamp dynverCurrentDate.value)