From e937c1e441f1b76ff88dcdfeaa48106b78bac777 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Mon, 4 Mar 2024 03:08:49 -0500 Subject: [PATCH] Include main as main branch candidate --- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3bf0f8e..10f62ec 100644 --- 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 index 2fce953..568efed 100644 --- 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: