Merge pull request #356 from lrytz/ci-release

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

Author: lrytz

.circleci/config.yml

@@ -14,7 +14,7 @@ commands:
     parameters:
       scala_version:
         type: string
-        default: 2.12.9
+        default: 2.12.10
       sbt_tasks:
         type: string
         default: update compile test:compile test doc package
@@ -38,7 +38,7 @@ jobs:
     parameters:
       scala_version:
         description: "Scala version"
-        default: 2.12.9
+        default: 2.12.10
         type: string
       java_version:
         description: "Java version"
@@ -55,7 +55,7 @@ jobs:
     parameters:
       scala_version:
         description: "Scala version"
-        default: 2.12.9
+        default: 2.12.10
         type: string
       scalajs_version:
         description: "ScalaJS version"
@@ -75,9 +75,9 @@ workflows:
   build:
     jobs:
       - scala_job:
-          name: 2.12.9
+          name: 2.12.10
           java_version: jdk8
-          scala_version: 2.12.9
+          scala_version: 2.12.10
       - scala_job:
           name: 2.13.0
           java_version: jdk8
@@ -87,9 +87,9 @@ workflows:
           java_version: jdk8
           scala_version: 0.18.1-RC1
       - scala_job:
-          name: jdk11_2.12.9
+          name: jdk11_2.12.10
           java_version: jdk11
-          scala_version: 2.12.9
+          scala_version: 2.12.10
       - scala_job:
           name: jdk11_2.13.0
           java_version: jdk11
@@ -100,15 +100,15 @@ workflows:
           scala_version: 0.18.1-RC1
       - scalajs_job:
           name: sjs0.6_2.12
-          scala_version: 2.12.9
+          scala_version: 2.12.10
           scalajs_version: 0.6.28
       - scalajs_job:
           name: sjs0.6_2.13
           scala_version: 2.13.0
           scalajs_version: 0.6.28
       - scalajs_job:
           name: sjs1.0.0-M8_2.12
-          scala_version: 2.12.9
+          scala_version: 2.12.10
           scalajs_version: 1.0.0-M8
       - scalajs_job:
           name: sjs1.0.0-M8_2.13

.travis.yml

@@ -1,24 +1,15 @@
 language: scala
 
 scala:
-  - 2.12.9
-  - 2.13.0
   - 0.18.1-RC1
+  - 2.12.10
+  - 2.13.0
 
 env:
-  global:
-    # PGP_PASSPHRASE
-    - secure: "BYC1kEnHjNrINrHYWPGEuTTJ2V340/0ByzqeihLecjoZ75yrjWdsh6MI1JEUWgv5kb+58vLzib21JfnjsPK6Yb2bSXuCFCsEtJNh6RJKgxkWlCOzfTSh5I2wl7PCjRClRL6gseX2uTSvFjL4Z//pmxwxeXlLp7voQe4QAUq1+sE="
-    # SONA_USER
-    - secure: "OpBwPc1GNvauageYOH3RscAa7wpZxgpmqDz15aigIKLNWzAhAtVUx0MleZ8rQeoqml6nrAvlnzuVHjKL2lVcjMPpjUis7bcQ5UAGK7tZK8x+qZNQxXmpXu8+pENwQA2yFaqt/xy7K5jFOrHJHTRxcPnyVG1yKakPWz53PPYUwbc="
-    # SONA_PASS
-    - secure: "Xw7rI/qlML1nD2e2XwlakkhKAWNGZKqqE+Q3ntTvFpfHryl7KLCvVzJ4LIavnL6kGJaWOgy9vlSoEWn5g9nqHSfE31C/k5pY5nTMAKiwiJzfAS+r0asKXW2gmKhwtcTBkqyLVOZLCJSPVlFRQyfBJHY+Fs0L3KWcnMQgtBlyDhU="
-  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
+  - SCALAJS_VERSION=         ADOPTOPENJDK=8
+  - SCALAJS_VERSION=0.6.28   ADOPTOPENJDK=8
+  - SCALAJS_VERSION=1.0.0-M8 ADOPTOPENJDK=8
+  - SCALAJS_VERSION=         ADOPTOPENJDK=11
 
 matrix:
   exclude:
@@ -31,20 +22,21 @@ 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/"
   - curl -sL https://get.sdkman.io | bash
-  - echo sdkman_auto_answer=true > "$HOME/.sdkman/etc/config"
+  - echo sdkman_auto_answer=true > $HOME/.sdkman/etc/config
   - source "$HOME/.sdkman/bin/sdkman-init.sh"
 
 install:
   - sdk install java $(sdk list java | grep -o "$ADOPTOPENJDK\.[0-9\.]*hs-adpt" | head -1)
   - unset JAVA_HOME
   - java -Xmx32m -version
+  - git fetch --tags # get all tags for sbt-dynver
 
-script:
-  - admin/build.sh
+script: ./build.sh
 
 before_cache:
   - find $HOME/.sbt -name "*.lock" | xargs rm
   - find $HOME/.ivy2/cache -name "ivydata-*.properties" | xargs rm
+  - rm -f $HOME/.ivy2/.sbt.ivy.lock
   - find $HOME/.coursier -name "*.lock" | xargs rm
 cache:
   directories: