From 94a78bca8ec489a19d7b806fd332952be3569030 Mon Sep 17 00:00:00 2001 From: Daniel Vigovszky Date: Wed, 9 Sep 2020 08:41:34 +0200 Subject: [PATCH] sbt-ci-release --- .travis.yml | 33 ++++++++++++++++++++++++--------- build.sbt | 6 ++---- project/plugins.sbt | 5 +---- 3 files changed, 27 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index 82f398b2..98a88dfe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,33 @@ language: scala scala: - - 2.12.10 - - 2.13.1 + - 2.12.12 + - 2.13.3 before_install: + - git fetch --tags - if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then bash -x scripts/decrypt_keys.sh; fi - export PATH=${PATH}:./vendor/bundle + +stages: + - name: test + - name: release + if: ((branch = master AND type = push) OR (tag IS present)) AND NOT fork + - name: microsite + if: ((branch = master AND type = push) AND NOT fork) + +jobs: + include: + - stage: test + name: "Compile and test" + script: sbt ++$TRAVIS_SCALA_VERSION clean coverage test coverageReport && bash <(curl -s https://codecov.io/bash) + - stage: release + name: "Release" + script: sbt ci-release + - stage: microsite + scala: 2.13.3 + name: "Publish microsite" + script: bash scripts/publish_microsite.sh + install: - rvm use 2.6.0 --install --fuzzy - gem update --system @@ -14,13 +36,6 @@ install: - gem install jemoji -v 0.11.1 - gem install jekyll-sitemap -v 1.4.0 -script: - - sbt ++$TRAVIS_SCALA_VERSION clean coverage test coverageReport - -after_success: - - bash <(curl -s https://codecov.io/bash) - - if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then sbt ++$TRAVIS_SCALA_VERSION clean coverageOff compile publish; fi - - if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then bash scripts/publish_microsite.sh; fi env: global: - secure: msl3heebF3k3zdMKrjzefj0u+HAbZDf8vS2UC6poFv5OcNatVK73ZYApayq5otU80PTaJZaDdnsuyrMXggeWC/X+tnMZH781h7ckev+22+qOUNs6ZL1RS2cQ4OFuaNFhmr+eteShgGI26p4PmnRATV7IrUnw5s66BZJdFTBwvVtTpQ4d7WY0X/16YzXbZbXiYfAn/3txphJE8Lbh4/PqsySoIRdhIGWNiOoK8db/DrY3tQ2lHHuU1hme6FeBzFMJxjvrdCg+RPP+LKpTZdkzBHKvoa8DiTM96Z1Iqw5cjCLABq44KMlC5tZ3fj0mtxuPMdcbWYVTHmdMaE5pgrcckbIvtwbp9C8GgfNoJuuVmftazoZvXYVmk/7hZ+GrD7WoJrt72ijO8JOwGgUjqs3Vche6dXccDKe0c3fXhF7Y7W58yjF0bNrzYfez6BKELkrR3GObf7k/vVdsGAT4B6YeLIRtE/+xtiLqf7YZUP6+fC488pAZRrYlj2JW+8duzR4XLa5E+z08hw9OxNglFWMgkoav0dTaR93PFc01EpjonlV2nDbEl/LHuW463efow1/2dwqFBRbOhramaf56sfB0pAZjFx1nIiuHhDZm6UDjLH4v9lXWoRR9IaCPEpeWDvhj5kp5W6MvUJhwlyY83PNSwJPTWGkViJvWGrcPUTRb1vg= diff --git a/build.sbt b/build.sbt index 0e62af04..1fe4aa10 100644 --- a/build.sbt +++ b/build.sbt @@ -4,8 +4,8 @@ organization := "io.github.vigoo" dynverSonatypeSnapshots in ThisBuild := true -val scala212 = "2.12.10" -val scala213 = "2.13.2" +val scala212 = "2.12.12" +val scala213 = "2.13.3" scalaVersion := scala213 crossScalaVersions := List(scala212, scala213) @@ -45,8 +45,6 @@ publishMavenStyle := true licenses := Seq("APL2" -> url("http://www.apache.org/licenses/LICENSE-2.0.txt")) -publishTo := sonatypePublishTo.value - import microsites.ConfigYml import xerial.sbt.Sonatype._ sonatypeProjectHosting := Some(GitHubHosting("vigoo", "prox", "daniel.vigovszky@gmail.com")) diff --git a/project/plugins.sbt b/project/plugins.sbt index dc6f84e9..9d4b4935 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,9 +1,6 @@ addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1") addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3") -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.4") -addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1") -addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1") addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.5.1") addSbtPlugin("com.47deg" % "sbt-microsites" % "1.2.1") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.3") - +addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.3")