diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6521d90..a4c54b6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -122,15 +122,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') || github.ref == 'refs/heads/main') + if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/master') run: mkdir -p fs2/.native/target target .js/target .jvm/target .native/target fs2/.js/target fs2/.jvm/target project/target - name: Compress target directories - if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') + if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/master') run: tar cf targets.tar fs2/.native/target target .js/target .jvm/target .native/target fs2/.js/target fs2/.jvm/target project/target - name: Upload target directories - if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') + if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/master') uses: actions/upload-artifact@v2 with: name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}-${{ matrix.project }} @@ -139,7 +139,7 @@ jobs: publish: name: Publish Artifacts needs: [build] - if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') + if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/master') strategy: matrix: os: [ubuntu-latest] diff --git a/build.sbt b/build.sbt index d557219..ee71bb6 100644 --- a/build.sbt +++ b/build.sbt @@ -1,8 +1,6 @@ ThisBuild / tlBaseVersion := "0.14" ThisBuild / startYear := Some(2017) -ThisBuild / resolvers ++= Resolver.sonatypeOssRepos("snapshots") - val circeVersion = "0.14.3" val fs2Version = "3.5.0" val jawnVersion = "1.4.0" @@ -18,6 +16,8 @@ val scala213 = "2.13.10" ThisBuild / scalaVersion := scala213 ThisBuild / crossScalaVersions := Seq(scala212, scala213, "3.2.1") +ThisBuild / tlCiReleaseBranches := Seq("master") + lazy val root = tlCrossRootProject.aggregate(fs2) lazy val fs2 = crossProject(JVMPlatform, JSPlatform, NativePlatform)