Clean up home dir and drone build steps. (#823)

Tests should only run on push to master and PRs, not when I push to WIP branches.
scalameta · Mar 12, 2017 · 1e9e7dd · 1e9e7dd
1 parent 411ff5f
commit 1e9e7dd
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 12 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -9,14 +9,25 @@ pipeline:
       - /drone/.sbt
       - /drone/.git
 
-  tests:
+  tests_pr:
     image: scalaplatform/scala:0.6
-    pull: true
     volumes:
       - /platform:/keys
     commands:
-      - ./scalafmt --test
+      - ./bin/scalafmt --test
       - sbt $TEST
+    when:
+      event: pull_request
+
+  tests_merge:
+    image: scalaplatform/scala:0.6
+    volumes:
+      - /platform:/keys
+    commands:
+      - sbt $TEST
+    when:
+      event: push
+      branch: [master]
 
   notify:
     image: drillster/drone-email

diff --git a/.drone.yml.sig b/.drone.yml.sig
@@ -1 +1 @@
-eyJhbGciOiJIUzI1NiJ9.cGlwZWxpbmU6CiAgIyBGZXRjaCBmb2xkZXJzIGZyb20gZGlzdHJpYnV0ZWQgY2FjaGUKICBzZnRwX2NhY2hlX3Jlc3RvcmU6CiAgICBpbWFnZTogcGx1Z2lucy9zZnRwLWNhY2hlCiAgICByZXN0b3JlOiB0cnVlCiAgICBtb3VudDoKICAgICAgLSAvZHJvbmUvLml2eTIKICAgICAgLSAvZHJvbmUvLmNvdXJzaWVyLWNhY2hlCiAgICAgIC0gL2Ryb25lLy5zYnQKICAgICAgLSAvZHJvbmUvLmdpdAoKICB0ZXN0czoKICAgIGltYWdlOiBzY2FsYXBsYXRmb3JtL3NjYWxhOjAuNgogICAgcHVsbDogdHJ1ZQogICAgdm9sdW1lczoKICAgICAgLSAvcGxhdGZvcm06L2tleXMKICAgIGNvbW1hbmRzOgogICAgICAtIC4vc2NhbGFmbXQgLS10ZXN0CiAgICAgIC0gc2J0ICRURVNUCgogIG5vdGlmeToKICAgIGltYWdlOiBkcmlsbHN0ZXIvZHJvbmUtZW1haWwKICAgIGhvc3Q6IHNtdHAubWFpbGd1bi5vcmcKICAgIHVzZXJuYW1lOiBub3JlcGx5QGRyb25lLmdlaXJzc29uLmNvbQogICAgcGFzc3dvcmQ6ICR7TUFJTEdVTl9QQVNTV09SRH0KICAgIGZyb206IG5vcmVwbHlAZHJvbmUuZ2VpcnNzb24uY29tCiAgICByZWNpcGllbnRzOgogICAgICAtIG9sYWZ1cnBnQGdtYWlsLmNvbQogICAgd2hlbjoKICAgICAgZXZlbnQ6IHB1c2gKICAgICAgYnJhbmNoOiBbbWFzdGVyXQogICAgICBzdGF0dXM6IFtjaGFuZ2VkLCBmYWlsdXJlXQoKICAjIFNhdmUgZm9sZGVycyBpbiBkaXN0cmlidXRlZCBjYWNoZQogIHNmdHBfY2FjaGVfcmVidWlsZDoKICAgIGltYWdlOiBwbHVnaW5zL3NmdHAtY2FjaGUKICAgIHJlYnVpbGQ6IHRydWUKICAgIG1vdW50OgogICAgICAtIC9kcm9uZS8uaXZ5MgogICAgICAtIC9kcm9uZS8uY291cnNpZXItY2FjaGUKICAgICAgLSAvZHJvbmUvLnNidAogICAgICAtIC9kcm9uZS8uZ2l0CgptYXRyaXg6CiAgVEVTVDoKICAgIC0gY2ktZmFzdAogICAgLSBjaS1zbG93Cgo.Sleu5KcZGSs7EYzie0PbCz4W_LRPA_Uj-9oXHMFme_Q
+eyJhbGciOiJIUzI1NiJ9.cGlwZWxpbmU6CiAgIyBGZXRjaCBmb2xkZXJzIGZyb20gZGlzdHJpYnV0ZWQgY2FjaGUKICBzZnRwX2NhY2hlX3Jlc3RvcmU6CiAgICBpbWFnZTogcGx1Z2lucy9zZnRwLWNhY2hlCiAgICByZXN0b3JlOiB0cnVlCiAgICBtb3VudDoKICAgICAgLSAvZHJvbmUvLml2eTIKICAgICAgLSAvZHJvbmUvLmNvdXJzaWVyLWNhY2hlCiAgICAgIC0gL2Ryb25lLy5zYnQKICAgICAgLSAvZHJvbmUvLmdpdAoKICB0ZXN0c19wcjoKICAgIGltYWdlOiBzY2FsYXBsYXRmb3JtL3NjYWxhOjAuNgogICAgdm9sdW1lczoKICAgICAgLSAvcGxhdGZvcm06L2tleXMKICAgIGNvbW1hbmRzOgogICAgICAtIC4vYmluL3NjYWxhZm10IC0tdGVzdAogICAgICAtIHNidCAkVEVTVAogICAgd2hlbjoKICAgICAgZXZlbnQ6IHB1bGxfcmVxdWVzdAoKICB0ZXN0c19tZXJnZToKICAgIGltYWdlOiBzY2FsYXBsYXRmb3JtL3NjYWxhOjAuNgogICAgdm9sdW1lczoKICAgICAgLSAvcGxhdGZvcm06L2tleXMKICAgIGNvbW1hbmRzOgogICAgICAtIHNidCAkVEVTVAogICAgd2hlbjoKICAgICAgZXZlbnQ6IHB1c2gKICAgICAgYnJhbmNoOiBbbWFzdGVyXQoKICBub3RpZnk6CiAgICBpbWFnZTogZHJpbGxzdGVyL2Ryb25lLWVtYWlsCiAgICBob3N0OiBzbXRwLm1haWxndW4ub3JnCiAgICB1c2VybmFtZTogbm9yZXBseUBkcm9uZS5nZWlyc3Nvbi5jb20KICAgIHBhc3N3b3JkOiAke01BSUxHVU5fUEFTU1dPUkR9CiAgICBmcm9tOiBub3JlcGx5QGRyb25lLmdlaXJzc29uLmNvbQogICAgcmVjaXBpZW50czoKICAgICAgLSBvbGFmdXJwZ0BnbWFpbC5jb20KICAgIHdoZW46CiAgICAgIGV2ZW50OiBwdXNoCiAgICAgIGJyYW5jaDogW21hc3Rlcl0KICAgICAgc3RhdHVzOiBbY2hhbmdlZCwgZmFpbHVyZV0KCiAgIyBTYXZlIGZvbGRlcnMgaW4gZGlzdHJpYnV0ZWQgY2FjaGUKICBzZnRwX2NhY2hlX3JlYnVpbGQ6CiAgICBpbWFnZTogcGx1Z2lucy9zZnRwLWNhY2hlCiAgICByZWJ1aWxkOiB0cnVlCiAgICBtb3VudDoKICAgICAgLSAvZHJvbmUvLml2eTIKICAgICAgLSAvZHJvbmUvLmNvdXJzaWVyLWNhY2hlCiAgICAgIC0gL2Ryb25lLy5zYnQKICAgICAgLSAvZHJvbmUvLmdpdAoKbWF0cml4OgogIFRFU1Q6CiAgICAtIGNpLWZhc3QKICAgIC0gY2ktc2xvdwoK._ae9fWzEVqNuiQCSsELxicGo50wAOZ8ceRc0_L8wnXk
diff --git a/run-benchmarks.sh → bin/run-benchmarks.sh b/run-benchmarks.sh → bin/run-benchmarks.sh
diff --git a/sbt → bin/sbt b/sbt → bin/sbt
diff --git a/bin/scalafmt b/bin/scalafmt
diff --git a/bin/testAll.sh b/bin/testAll.sh
diff --git a/deploy_key.gpg b/deploy_key.gpg
diff --git a/homebrew_key.gpg b/homebrew_key.gpg
diff --git a/readme.md b/readme.md
@@ -13,7 +13,7 @@ Head over to [the user docs][docs] for instructions on how to install scalafmt.
 - Hack on IntelliJ plugin: see [this doc](intellij/readme.md).
 - Hack on scalafmt: see [tutorial](Tutorial.md).
 - Hack on SBT plugin: run `sbt scripted`.
-- Run jmh benchmarks: `run-benchmarks.sh`.
+- Run jmh benchmarks: `./bin/run-benchmarks.sh`.
 - Run formatter on millions of lines of code: `core/test:runMain  org.scalafmt.FormatExperimentApp`:
 - Debug performance: after each test run in `FormatTests`, a flamegraph report
   like [this one](https://github.com/olafurpg/scalafmt/issues/140)

diff --git a/scalafmt b/scalafmt