Merge pull request #173 from eed3si9n/wip/branch

Include main as main branch candidate
sbt · Mar 4, 2024 · 2e7a80a · 2e7a80a
2 parents 3ab9b6f + e937c1e
commit 2e7a80a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,7 +28,7 @@ jobs:
       with:
         java-version: ${{ matrix.java }}
         distribution: temurin
-    - uses: coursier/cache-action@v6
+        cache: sbt
     - shell: bash
       run: sbt -v $(if [[ "${{matrix.sbt_version}}" != "" ]] ; then echo "^^${{matrix.sbt_version}}" ; fi) test scripted
     - shell: bash

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,7 +1,7 @@
 name: Release
 on:
   push:
-    branches: [master]
+    branches: ["master", "main"]
     tags: ["*"]
 jobs:
   publish:
@@ -14,6 +14,7 @@ jobs:
         with:
           java-version: 8
           distribution: adopt
+          cache: sbt
       - run: sbt -Dsbt.io.jdktimestamps=true ci-release
         if: ${{ github.repository_owner == 'sbt' }}
         env: