From 23a77b92b15708bd466c6540b4c6aa0b2234fe03 Mon Sep 17 00:00:00 2001 From: JanBessai Date: Wed, 12 Feb 2020 16:29:43 +0100 Subject: [PATCH] Revert "Switch from sbt-release-early to sbt-ci-release" This reverts commit 4538fbcac2a49e859c552a660826bf34d309b673. --- .travis.yml | 10 +++------- build.sbt | 3 +-- project/plugins.sbt | 3 ++- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index a04cc2f..ded7753 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,9 @@ sudo: false language: scala - -before_install: - - git fetch --tags - stages: - test - name: deploy - if: ((branch = master AND type = push) OR (tag IS present)) AND NOT fork + if: branch = master AND NOT type IN (pull_request) script: sbt +test @@ -21,11 +17,11 @@ jobs: jdk: openjdk11 script: sbt clean coverage +test && sbt coverageReport coveralls - stage: deploy - jdk: openjdk11 + jdk: openjdk8 script: | openssl aes-256-cbc -K $encrypted_15ce06f7b2e5_key -iv $encrypted_15ce06f7b2e5_iv -in travis/secrets.tar.enc -out travis/local.secrets.tar -d && tar xv -C travis -f travis/local.secrets.tar && - sbt ci-release + sbt +releaseEarly env: global: - secure: "e/Doy2GpbQxUUdJ/51wlBs+WSiozVSyuGjzo+kr8hp7h6Qa5dEmsUi82jShrs2fDVW27Ivmph08Yr4JnosWlkrW08Hz1tFrXDdauDXSwBkL54wdcriUWWKDmhtJ10y6NfB5xhU2xph+kUM04oT5v3EsN5adrIg7VkSDP12k8PPR1Aup4AR9cyI3kWkkK4IP13XMMam/p0cXrSDH20KJbDONFG3yjP1YN34TGlC/D6i1TvIP5+GEPR0oX4YMAHw8vZHCIokslSpjcegOQxLVP58SC8v4WIBIJ/D6Z24itBzQrrp4IhCIXUVp+Y2JE4nVSAXWVKuP7bs/NY+U7zr5GJVD7nE6m2YmEkjV/Q8dFhemIYLgPSDW7uAo8vpC8J76C0CA/+59nKNrmXRz4JqnH6FQbBfU2tpFztG/iiTG3fuV8WMjTMmiyyCuFrFqPUwA47f5vMOSyHdQc7hkhyARch1XV+o8bflNaJbv18lOuuKvx5eVyZzcAyrDf20ZFqVdC+K2hfYHaknCvPXQdysfz6Go36Q6ls7Z3tOSYKtN8rtTk5d1CivpGrkjcQ7SMOT1UP/iR/qVYdrkuJkWLN/HJXWLisBpns6w0bROoa0wSrzHeZxzuoPvghO2BjVqAGUUSd8Er++HYSjhFZY5Bp5vm4CEyP2DB/B7jgF8QSS3pj9o=" diff --git a/build.sbt b/build.sbt index ea99462..51a34f7 100644 --- a/build.sbt +++ b/build.sbt @@ -72,6 +72,5 @@ lazy val publishSettings = Seq( lazy val noPublishSettings = Seq( publish := Seq.empty, publishLocal := Seq.empty, - publishArtifact := false, - skip in publish := true + publishArtifact := false ) diff --git a/project/plugins.sbt b/project/plugins.sbt index b50b549..0687bfa 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,8 @@ logLevel := Level.Warn addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1") addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.2.7") -addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.0") +addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2") +addSbtPlugin("ch.epfl.scala" % "sbt-release-early" % "2.1.1") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.4.0") addSbtPlugin("com.sksamuel.scapegoat" %% "sbt-scapegoat" % "1.1.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.3.1")