More build fixes

monix · Sep 7, 2024 · a81f0ef · a81f0ef
1 parent 612d88b
commit a81f0ef
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 32 deletions.
diff --git a/.github/scripts/build.sh b/.github/scripts/build.sh
diff --git a/.github/scripts/release b/.github/scripts/release
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+cd "$(dirname "$0")/.."
+
 git fetch --depth=100 origin +refs/tags/*:refs/tags/*
 
 if [ "$PUBLISH_STABLE_VERSION" != "true" ]; then
@@ -13,8 +15,8 @@ echo "PUBLISH_STABLE_VERSION=$PUBLISH_STABLE_VERSION"
 
 if [[ "$PUBLISH_STABLE_VERSION" = "true" ]]; then
   echo "Publishing stable version ..."
-  exec sbt +clean +publishSigned sonatypeBundleRelease
+  exec ./sbt +clean +publishSigned sonatypeBundleRelease
 else
   echo "Publishing snapshot ..."
-  exec sbt +clean +publishSigned
+  exec ./sbt +clean +publishSigned
 fi
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   tests:
-    name: Unit tests (scala ${{ matrix.scala }}, jvm ${{ matrix.java }})
+    name: Unit tests / JVM ${{ matrix.java }}
     strategy:
       fail-fast: false   
       matrix:

diff --git a/.github/workflows/manual-publish.yml b/.github/workflows/manual-publish.yml
@@ -23,9 +23,12 @@ jobs:
           fetch-depth: 100
           ref: ${{ github.event.inputs.ref_to_publish }}
 
-      - uses: olafurpg/setup-scala@v10
+      - name: Set up JDK ${{ matrix.java-version }}
+        uses: actions/setup-java@v4
         with:
-          java-version: "adopt@1.8"
+          cache: 'sbt'
+          java-version: 8
+          distribution: 'temurin'
 
       - name: Install GnuPG2
         run: |
@@ -35,9 +38,9 @@ jobs:
         run: |
           git fetch --depth=100 origin +refs/tags/*:refs/tags/*
           if [ "$PUBLISH_STABLE_VERSION" = "true" ]; then
-            sbt ci-release
+            ./sbt ci-release
           else
-            sbt +clean +publishSigned
+            ./sbt +clean +publishSigned
           fi
         env:
           PGP_KEY_HEX: ${{ secrets.PGP_KEY_HEX }}