From 4a7c7940fa4fbb993835ce9c56e94442d962d708 Mon Sep 17 00:00:00 2001 From: Brian Holt Date: Tue, 16 Jul 2024 18:17:39 -0500 Subject: [PATCH] add main to tlCiReleaseBranches to publish snapshots on PR merges --- .github/workflows/ci.yml | 8 ++++---- build.sbt | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fd40cae..c932cc3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,15 +71,15 @@ jobs: run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' doc - name: Make target directories - if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v')) + if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') run: mkdir -p core/.js/target core/.jvm/target project/target - name: Compress target directories - if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v')) + if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') run: tar cf targets.tar core/.js/target core/.jvm/target project/target - name: Upload target directories - if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v')) + if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') uses: actions/upload-artifact@v4 with: name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}-${{ matrix.project }} @@ -88,7 +88,7 @@ jobs: publish: name: Publish Artifacts needs: [build] - if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v')) + if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') strategy: matrix: os: [ubuntu-latest] diff --git a/build.sbt b/build.sbt index fb43586..56ad20a 100644 --- a/build.sbt +++ b/build.sbt @@ -21,6 +21,7 @@ ThisBuild / mergifyStewardConfig ~= { _.map { _.withAuthor("dwolla-oss-scala-steward[bot]") .withMergeMinors(true) }} +ThisBuild / tlCiReleaseBranches += "main" lazy val `natchez-smithy4s` = crossProject(JVMPlatform, JSPlatform) .crossType(CrossType.Pure)