Skip to content

Commit 1c021f8

Browse files
committed
Use EPFL Artifactory for resolution.
Also, it always bugged me that misformatted file errors blocked tests. This change makes it so that scalafmt is only run on a single entry in the build matrix
1 parent fbcd6da commit 1c021f8

File tree

5 files changed

+29
-4
lines changed

5 files changed

+29
-4
lines changed

.drone.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ pipeline:
77
pull: true
88
commands:
99
- git fetch --tags && git log | head -n 20
10-
- ./scalafmt --test
11-
- /usr/bin/sbt $CI_TEST
10+
- ./bin/runci.sh $CI_TEST
1211

1312
publish:
1413
image: olafurpg/scalafix:0.3.0
@@ -30,3 +29,4 @@ matrix:
3029
CI_SCALA_VERSION: 2.12.2
3130
- CI_TEST: ci-slow
3231
CI_SCALA_VERSION: 2.11.11
32+
- CI_TEST: scalafmt

.drone.yml.sig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
eyJhbGciOiJIUzI1NiJ9.cGlwZWxpbmU6CiAgdGVzdHM6CiAgICBpbWFnZTogc2NhbGFwbGF0Zm9ybS9zY2FsYToxLjIKICAgIGVudmlyb25tZW50OgogICAgICAtIEJJTlRSQVlfVVNFUk5BTUU9Zm9vX3VzZXIKICAgICAgLSBCSU5UUkFZX1BBU1NXT1JEPWZvb19wYXNzd29yZAogICAgcHVsbDogdHJ1ZQogICAgY29tbWFuZHM6CiAgICAgIC0gZ2l0IGZldGNoIC0tdGFncyAmJiBnaXQgbG9nIHwgaGVhZCAtbiAyMAogICAgICAtIC4vc2NhbGFmbXQgLS10ZXN0CiAgICAgIC0gL3Vzci9iaW4vc2J0ICRDSV9URVNUCgogIHB1Ymxpc2g6CiAgICBpbWFnZTogb2xhZnVycGcvc2NhbGFmaXg6MC4zLjAKICAgIHB1bGw6IHRydWUKICAgIHZvbHVtZXM6CiAgICAgIC0gL3BsYXRmb3JtOi9rZXlzCiAgICBjb21tYW5kczoKICAgICAgLSAuL2Jpbi9wdWJsaXNoLnNoCiAgICB3aGVuOgogICAgICBldmVudDogW3B1c2gsIHRhZ10KICAgICAgYnJhbmNoOiBbbWFzdGVyXQoKbWF0cml4OgogIGluY2x1ZGU6CiAgICAtIENJX1RFU1Q6IGNpLWZhc3QKICAgICAgQ0lfU0NBTEFfVkVSU0lPTjogMi4xMS4xMQogICAgICBDSV9QVUJMSVNIOiB0cnVlCiAgICAtIENJX1RFU1Q6IGNpLWZhc3QKICAgICAgQ0lfU0NBTEFfVkVSU0lPTjogMi4xMi4yCiAgICAtIENJX1RFU1Q6IGNpLXNsb3cKICAgICAgQ0lfU0NBTEFfVkVSU0lPTjogMi4xMS4xMQo.CAw7B_peQuTMacKIPeaUMHKi4cjPPs-8TNi9oQ7OOEU
1+
eyJhbGciOiJIUzI1NiJ9.cGlwZWxpbmU6CiAgdGVzdHM6CiAgICBpbWFnZTogc2NhbGFwbGF0Zm9ybS9zY2FsYToxLjIKICAgIGVudmlyb25tZW50OgogICAgICAtIEJJTlRSQVlfVVNFUk5BTUU9Zm9vX3VzZXIKICAgICAgLSBCSU5UUkFZX1BBU1NXT1JEPWZvb19wYXNzd29yZAogICAgcHVsbDogdHJ1ZQogICAgY29tbWFuZHM6CiAgICAgIC0gZ2l0IGZldGNoIC0tdGFncyAmJiBnaXQgbG9nIHwgaGVhZCAtbiAyMAogICAgICAtIC4vYmluL3J1bmNpLnNoICRDSV9URVNUCgogIHB1Ymxpc2g6CiAgICBpbWFnZTogb2xhZnVycGcvc2NhbGFmaXg6MC4zLjAKICAgIHB1bGw6IHRydWUKICAgIHZvbHVtZXM6CiAgICAgIC0gL3BsYXRmb3JtOi9rZXlzCiAgICBjb21tYW5kczoKICAgICAgLSAuL2Jpbi9wdWJsaXNoLnNoCiAgICB3aGVuOgogICAgICBldmVudDogW3B1c2gsIHRhZ10KICAgICAgYnJhbmNoOiBbbWFzdGVyXQoKbWF0cml4OgogIGluY2x1ZGU6CiAgICAtIENJX1RFU1Q6IGNpLWZhc3QKICAgICAgQ0lfU0NBTEFfVkVSU0lPTjogMi4xMS4xMQogICAgICBDSV9QVUJMSVNIOiB0cnVlCiAgICAtIENJX1RFU1Q6IGNpLWZhc3QKICAgICAgQ0lfU0NBTEFfVkVSU0lPTjogMi4xMi4yCiAgICAtIENJX1RFU1Q6IGNpLXNsb3cKICAgICAgQ0lfU0NBTEFfVkVSU0lPTjogMi4xMS4xMQogICAgLSBDSV9URVNUOiBzY2FsYWZtdAo.DjLtSc3Q6xjSArP59XYTtwDxEPy685nloNsUL5LuT_s

bin/runci.sh

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/bin/sh
2+
set -eux
3+
TEST=${1}
4+
5+
case "$TEST" in
6+
"scalafmt" )
7+
./scalafmt --test
8+
;;
9+
* )
10+
sbt $TEST
11+
;;
12+
esac
13+
14+
15+
16+

build.sbt

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,12 @@ lazy val allSettings = List(
8484
version := sys.props.getOrElse("scalafix.version", version.value),
8585
resolvers += Resolver.bintrayRepo("scalameta", "maven"),
8686
resolvers += Resolver.sonatypeRepo("releases"),
87+
resolvers ~= { old =>
88+
if (isDroneCI) {
89+
println(s"Using resolver: $epflArtifactory")
90+
epflArtifactory +: old
91+
} else old
92+
},
8793
triggeredMessage in ThisBuild := Watched.clearWhenTriggered,
8894
scalacOptions := compilerOptions,
8995
scalacOptions in (Compile, console) := compilerOptions :+ "-Yrepl-class-based",
@@ -331,5 +337,8 @@ def setId(project: Project): Project = {
331337
val newId = "scalafix-" + project.id
332338
project.copy(base = file(newId)).settings(moduleName := newId)
333339
}
334-
335340
def customScalafixVersion = sys.props.get("scalafix.version")
341+
def isDroneCI = sys.env("CI") == "DRONE"
342+
def epflArtifactory =
343+
MavenRepository("epfl-artifactory",
344+
"http://scala-webapps.epfl.ch:8081/artifactory/dbuild/")

scalafmt

-308 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)