Merge 1.2.x into 1.x (take II)

.drone.yml

@@ -1,35 +1,44 @@
+matrix:
+  CI_SCALA_VERSION:
+    - 2.12.6
+
+clone:
+  git:
+    image: plugins/git
+    tags: true
+    recursive: true
+    depth: 50
+
 pipeline:
-  # Fetch folders from distributed cache
-  sftp_cache_restore:
-    image: plugins/sftp-cache
+  restore_cache:
+    image: appleboy/drone-sftp-cache
+    when:
+      ref: [ refs/heads/1.x, refs/tags/*, refs/pull/*/head ]
+    secrets: [ sftp_cache_username, sftp_cache_private_key, sftp_cache_server, sftp_cache_path ]
     restore: true
     mount:
-      - /drone/.ivy2
+      - /drone/.ivy2/cache
       - /drone/.coursier-cache
       - /drone/.sbt
       - /drone/.git
-    when:
-      event: [push, pull_request, tag, deployment]
 
   tests:
-    image: scalacenter/scala:1.0
+    image: scalacenter/scala-docs:1.3
+    when:
+      ref: [ refs/heads/1.x, refs/tags/*, refs/pull/*/head ]
     commands:
+      - export DRONE_DIR="/drone"
       - git fetch --tags && git log | head -n 20
-      - ./bin/run-ci.sh ${CI_SCALA_VERSION}
+      - ./bin/run-ci.sh
 
-  # Save folders in distributed cache
-  sftp_cache_rebuild:
-    image: plugins/sftp-cache
+  rebuild_cache:
+    image: appleboy/drone-sftp-cache
+    when:
+      ref: [ refs/heads/1.x, refs/tags/*, refs/pull/*/head ]
+    secrets: [ sftp_cache_username, sftp_cache_private_key, sftp_cache_server, sftp_cache_path ]
     rebuild: true
     mount:
-      - /drone/.ivy2
+      - /drone/.ivy2/cache
       - /drone/.coursier-cache
       - /drone/.sbt
       - /drone/.git
-    when:
-      event: [push, pull_request, tag, deployment]
-
-matrix:
-  CI_SCALA_VERSION:
-    - 2.11.11
-    - 2.12.3

.gitignore

@@ -1,2 +1,6 @@
 target/
+target-2.10/
+target-2.11/
+target-2.12/
+target-2.13/
 zinc/src/test/resources/bin

bin/run-ci.sh

@@ -1,19 +1,18 @@
 #!/usr/bin/env bash
 set -eu
 set -o nounset
-SCALA_VERSION="$1"
 
+PROJECT_ROOT="zincRoot"
 sbt -Dfile.encoding=UTF-8 \
-  -J-XX:ReservedCodeCacheSize=256M \
-  -J-Xmx3046M -J-Xms3046M -J-server \
-  +mimaReportBinaryIssues \
+  -J-XX:ReservedCodeCacheSize=512M \
+  -J-Xms1024M -J-Xmx4096M -J-server \
+  "$PROJECT_ROOT/mimaReportBinaryIssues" \
   scalafmt::test \
   test:scalafmt::test \
   whitesourceCheckPolicies \
-  compilerInterfaceJava6Compat/compile \
-  zincRoot/test:compile \
+  "$PROJECT_ROOT/test:compile" \
   bloopScripted/compile \
   crossTestBridges \
-  "publishBridgesAndSet $SCALA_VERSION" \
-  zincRoot/test \
-  zincRoot/scripted
+  "publishBridges" \
+  "$PROJECT_ROOT/test" \
+  "$PROJECT_ROOT/scripted"