Merge pull request #238 from lrytz/ci-release

New scala-module-plugin with sbt-ci-release / travisci / dynver / header

Author: lrytz

.travis.yml

@@ -6,28 +6,21 @@ scala:
   - 2.13.0
 
 env:
-  global:
-    # PGP_PASSPHRASE
-    - secure: "SkBtn/6OjEldoikn0MFuyeLT/pau27kwKSDYTVQeJ4BKDzdWLwLE5Q3RukLGttIfNdhOvRoocpQSW9GkZfibTHmwrRnAokucfZCqTsKbwoOp1xIoOh5GrrVrB6gcP7WBTKinqFdBgSvLOrP7GviImz4ZuB9wq1r+mToGG4pDrXc="
-    # SONA_USER
-    - secure: "JSv/Er6q1XtTpRH1bpU63YBf7ufwg0vW+Kv/udQBtr8YX/P3gRYC1x6hW4uwftaKMYh7wXDkfNy51SRpH3kUptdJvjPUifVElyPiYlsumetmD+rZJmxX6agx+U5pdjIXPqPoton9MdSVHNTROeTu339bDak0Z+N5ht5wRfjP7F4="
-    # SONA_PASS
-    - secure: "OIVtcj7AHZr8Grpf03ZmZsygcADewiYIvSnRwLYCx+5AqOzs39EZ68DsIOxi7wEXVUbVj5RvLXpKzLX3iN+UszLOQRoFPFQyyn+3Y50f8T2aRxdZtInzXn0sCVTj4Hhd/zbKl1W+2Nh3Sqazab7tFoQVzEyYqhcPeiNRMF7h+aY="
-  matrix:
-    # The empty SCALAJS_VERSION will only compile for the JVM
-    - SCALAJS_VERSION=         ADOPTOPENJDK=8
-    - SCALAJS_VERSION=0.6.28   ADOPTOPENJDK=8
-    - SCALAJS_VERSION=1.0.0-M8 ADOPTOPENJDK=8
-    - SCALAJS_VERSION=         ADOPTOPENJDK=11
+  - ADOPTOPENJDK=8     SCALAJS_VERSION=
+  - ADOPTOPENJDK=8     SCALAJS_VERSION=0.6.28
+  - ADOPTOPENJDK=8     SCALAJS_VERSION=1.0.0-M8
+  - ADOPTOPENJDK=11    SCALAJS_VERSION=
 
 matrix:
   include:
-    - env: SCALANATIVE_VERSION=0.3.9    ADOPTOPENJDK=8
-    - env: SCALANATIVE_VERSION=0.4.0-M2 ADOPTOPENJDK=8
+    - scala: 2.11.12
+      env: ADOPTOPENJDK=8     SCALANATIVE_VERSION=0.3.9
+    - scala: 2.11.12
+      env: ADOPTOPENJDK=8     SCALANATIVE_VERSION=0.4.0-M2
 
 before_install:
   # adding $HOME/.sdkman to cache would create an empty directory, which interferes with the initial installation
-  - "[[ -d $HOME/.sdkman/bin/ ]] || rm -rf $HOME/.sdkman/"
+  - "[[ -d $HOME/.sdkman/bin ]] || rm -rf $HOME/.sdkman/"
   - curl -sL https://get.sdkman.io | bash
   - echo sdkman_auto_answer=true > $HOME/.sdkman/etc/config
   - source "$HOME/.sdkman/bin/sdkman-init.sh"
@@ -36,21 +29,21 @@ install:
   - sdk install java $(sdk list java | grep -o "$ADOPTOPENJDK\.[0-9\.]*hs-adpt" | head -1)
   - unset JAVA_HOME
   - java -Xmx32m -version
-  - javac -J-Xmx32m -version
+  - git fetch --tags # get all tags for sbt-dynver
 
-script: admin/build.sh
+script: ./build.sh
 
 notifications:
   email:
     - [email protected]
     - [email protected]
 
 before_cache:
-  - find $HOME/.sbt -name "*.lock" | xargs rm
-  - find $HOME/.ivy2/cache -name "ivydata-*.properties" | xargs rm
+  - rm -fv $HOME/.ivy2/.sbt.ivy.lock
+  - find $HOME/.ivy2/cache -name "ivydata-*.properties" -print -delete
+  - find $HOME/.sbt        -name "*.lock"               -print -delete
 cache:
   directories:
     - $HOME/.ivy2/cache
-    - $HOME/.sbt/boot
-    - $HOME/.sbt/launchers
+    - $HOME/.sbt
     - $HOME/.sdkman

admin/README.md

@@ -1,22 +1,14 @@
-import ScalaModulePlugin._
 import sbtcrossproject.CrossPlugin.autoImport.crossProject
 
-crossScalaVersions in ThisBuild := List("2.12.9", "2.11.12", "2.13.0")
-
 useCoursier in ThisBuild := !scalaVersion.value.startsWith("2.11.") // https://github.com/sbt/sbt/issues/4995
 
-lazy val root = project.in(file("."))
-  .aggregate(`scala-parser-combinatorsJS`, `scala-parser-combinatorsJVM`, `scala-parser-combinatorsNative`)
-  .settings(disablePublishing)
-
-lazy val `scala-parser-combinators` = crossProject(JSPlatform, JVMPlatform, NativePlatform)
+lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatform)
   .withoutSuffixFor(JVMPlatform).in(file("."))
-  .settings(scalaModuleSettings: _*)
-  .jvmSettings(scalaModuleSettingsJVM)
+  .settings(ScalaModulePlugin.scalaModuleSettings)
+  .jvmSettings(ScalaModulePlugin.scalaModuleSettingsJVM)
   .settings(
     name := "scala-parser-combinators",
-    version := "1.2.0-SNAPSHOT",
-    mimaPreviousVersion := None,
+    scalaModuleMimaPreviousVersion := None,
 
     apiMappings += (scalaInstance.value.libraryJar ->
         url(s"https://www.scala-lang.org/api/${scalaVersion.value}/")),
@@ -60,7 +52,3 @@ lazy val `scala-parser-combinators` = crossProject(JSPlatform, JVMPlatform, Nati
       else libraryDependencies.value
     }
   )
-
-lazy val `scala-parser-combinatorsJVM` = `scala-parser-combinators`.jvm
-lazy val `scala-parser-combinatorsJS` = `scala-parser-combinators`.js
-lazy val `scala-parser-combinatorsNative` = `scala-parser-combinators`.native

admin/build.sh

@@ -0,0 +1,75 @@
+#!/bin/bash
+
+set -e
+
+# Builds of tagged revisions are published to sonatype staging.
+
+# Travis runs a build on new revisions and on new tags, so a tagged revision is built twice.
+# Builds for a tag have TRAVIS_TAG defined, which we use for identifying tagged builds.
+
+# sbt-dynver sets the version number from the tag
+# sbt-travisci sets the Scala version from the travis job matrix
+
+# When a new binary incompatible Scala version becomes available, a previously released version
+# can be released using that new Scala version by creating a new tag containing the Scala version
+# after a hash, e.g., v1.2.3#2.13.0-M3. In this situation, the first job of the travis job
+# matrix builds the release. All other jobs are stopped. Make sure that the first job uses
+# the desired JVM version.
+
+# For normal tags that are cross-built, we release on JDK 8 for Scala 2.x
+isReleaseJob() {
+  if [[ "$ADOPTOPENJDK" == "8" && "$TRAVIS_SCALA_VERSION" =~ ^2\.1[01234]\..*$ ]]; then
+    true
+  else
+    false
+  fi
+}
+
+# For tags that define a Scala version, we pick the jobs of one Scala version (2.13.x) to do the releases
+isTagScalaReleaseJob() {
+  if [[ "$ADOPTOPENJDK" == "8" && "$TRAVIS_SCALA_VERSION" =~ ^2\.13\.[0-9]+$ ]]; then
+    true
+  else
+    false
+  fi
+}
+
+if [[ "$SCALAJS_VERSION" != "" ]]; then
+  projectPrefix="parserCombinatorsJS"
+elif [[ "$SCALANATIVE_VERSION" != "" ]]; then
+  projectPrefix="parserCombinatorsNative"
+else
+  projectPrefix="parserCombinators"
+fi
+
+verPat="[0-9]+\.[0-9]+\.[0-9]+(-[A-Za-z0-9-]+)?"
+tagPat="^v$verPat(#$verPat)?$"
+
+if [[ "$TRAVIS_TAG" =~ $tagPat ]]; then
+  releaseTask="ci-release"
+  tagScalaVer=$(echo $TRAVIS_TAG | sed s/[^#]*// | sed s/^#//)
+  if [[ "$tagScalaVer" == "" ]]; then
+    if ! isReleaseJob; then
+      echo "Not releasing on Java $ADOPTOPENJDK with Scala $TRAVIS_SCALA_VERSION"
+      exit 0
+    fi
+  else
+    if isTagScalaReleaseJob; then
+      setTagScalaVersion='set every scalaVersion := "'$tagScalaVer'"'
+    else
+      echo "The releases for Scala $tagScalaVer are built by other jobs in the travis job matrix"
+      exit 0
+    fi
+  fi
+fi
+
+# default is +publishSigned; we cross-build with travis jobs, not sbt's crossScalaVersions
+export CI_RELEASE="$projectPrefix/publishSigned"
+export CI_SNAPSHOT_RELEASE="$projectPrefix/publish"
+
+# default is sonatypeBundleRelease, which closes and releases the staging repo
+# see https://github.com/xerial/sbt-sonatype#commands
+# for now, until we're confident in the new release scripts, just close the staging repo.
+export CI_SONATYPE_RELEASE="; sonatypePrepare; sonatypeBundleUpload; sonatypeClose"
+
+sbt "$setTagScalaVersion" clean $projectPrefix/test $projectPrefix/publishLocal $releaseTask