File tree 5 files changed +29
-4
lines changed 5 files changed +29
-4
lines changed Original file line number Diff line number Diff line change @@ -7,8 +7,7 @@ pipeline:
7
7
pull : true
8
8
commands :
9
9
- git fetch --tags && git log | head -n 20
10
- - ./scalafmt --test
11
- - /usr/bin/sbt $CI_TEST
10
+ - ./bin/runci.sh $CI_TEST
12
11
13
12
publish :
14
13
image : olafurpg/scalafix:0.3.0
@@ -30,3 +29,4 @@ matrix:
30
29
CI_SCALA_VERSION : 2.12.2
31
30
- CI_TEST : ci-slow
32
31
CI_SCALA_VERSION : 2.11.11
32
+ - CI_TEST : scalafmt
Original file line number Diff line number Diff line change 1
- eyJhbGciOiJIUzI1NiJ9.cGlwZWxpbmU6CiAgdGVzdHM6CiAgICBpbWFnZTogc2NhbGFwbGF0Zm9ybS9zY2FsYToxLjIKICAgIGVudmlyb25tZW50OgogICAgICAtIEJJTlRSQVlfVVNFUk5BTUU9Zm9vX3VzZXIKICAgICAgLSBCSU5UUkFZX1BBU1NXT1JEPWZvb19wYXNzd29yZAogICAgcHVsbDogdHJ1ZQogICAgY29tbWFuZHM6CiAgICAgIC0gZ2l0IGZldGNoIC0tdGFncyAmJiBnaXQgbG9nIHwgaGVhZCAtbiAyMAogICAgICAtIC4vc2NhbGFmbXQgLS10ZXN0CiAgICAgIC0gL3Vzci9iaW4vc2J0ICRDSV9URVNUCgogIHB1Ymxpc2g6CiAgICBpbWFnZTogb2xhZnVycGcvc2NhbGFmaXg6MC4zLjAKICAgIHB1bGw6IHRydWUKICAgIHZvbHVtZXM6CiAgICAgIC0gL3BsYXRmb3JtOi9rZXlzCiAgICBjb21tYW5kczoKICAgICAgLSAuL2Jpbi9wdWJsaXNoLnNoCiAgICB3aGVuOgogICAgICBldmVudDogW3B1c2gsIHRhZ10KICAgICAgYnJhbmNoOiBbbWFzdGVyXQoKbWF0cml4OgogIGluY2x1ZGU6CiAgICAtIENJX1RFU1Q6IGNpLWZhc3QKICAgICAgQ0lfU0NBTEFfVkVSU0lPTjogMi4xMS4xMQogICAgICBDSV9QVUJMSVNIOiB0cnVlCiAgICAtIENJX1RFU1Q6IGNpLWZhc3QKICAgICAgQ0lfU0NBTEFfVkVSU0lPTjogMi4xMi4yCiAgICAtIENJX1RFU1Q6IGNpLXNsb3cKICAgICAgQ0lfU0NBTEFfVkVSU0lPTjogMi4xMS4xMQo.CAw7B_peQuTMacKIPeaUMHKi4cjPPs-8TNi9oQ7OOEU
1
+ eyJhbGciOiJIUzI1NiJ9.cGlwZWxpbmU6CiAgdGVzdHM6CiAgICBpbWFnZTogc2NhbGFwbGF0Zm9ybS9zY2FsYToxLjIKICAgIGVudmlyb25tZW50OgogICAgICAtIEJJTlRSQVlfVVNFUk5BTUU9Zm9vX3VzZXIKICAgICAgLSBCSU5UUkFZX1BBU1NXT1JEPWZvb19wYXNzd29yZAogICAgcHVsbDogdHJ1ZQogICAgY29tbWFuZHM6CiAgICAgIC0gZ2l0IGZldGNoIC0tdGFncyAmJiBnaXQgbG9nIHwgaGVhZCAtbiAyMAogICAgICAtIC4vYmluL3J1bmNpLnNoICRDSV9URVNUCgogIHB1Ymxpc2g6CiAgICBpbWFnZTogb2xhZnVycGcvc2NhbGFmaXg6MC4zLjAKICAgIHB1bGw6IHRydWUKICAgIHZvbHVtZXM6CiAgICAgIC0gL3BsYXRmb3JtOi9rZXlzCiAgICBjb21tYW5kczoKICAgICAgLSAuL2Jpbi9wdWJsaXNoLnNoCiAgICB3aGVuOgogICAgICBldmVudDogW3B1c2gsIHRhZ10KICAgICAgYnJhbmNoOiBbbWFzdGVyXQoKbWF0cml4OgogIGluY2x1ZGU6CiAgICAtIENJX1RFU1Q6IGNpLWZhc3QKICAgICAgQ0lfU0NBTEFfVkVSU0lPTjogMi4xMS4xMQogICAgICBDSV9QVUJMSVNIOiB0cnVlCiAgICAtIENJX1RFU1Q6IGNpLWZhc3QKICAgICAgQ0lfU0NBTEFfVkVSU0lPTjogMi4xMi4yCiAgICAtIENJX1RFU1Q6IGNpLXNsb3cKICAgICAgQ0lfU0NBTEFfVkVSU0lPTjogMi4xMS4xMQogICAgLSBDSV9URVNUOiBzY2FsYWZtdAo.DjLtSc3Q6xjSArP59XYTtwDxEPy685nloNsUL5LuT_s
Original file line number Diff line number Diff line change
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
+
Original file line number Diff line number Diff line change @@ -84,6 +84,12 @@ lazy val allSettings = List(
84
84
version := sys.props.getOrElse(" scalafix.version" , version.value),
85
85
resolvers += Resolver .bintrayRepo(" scalameta" , " maven" ),
86
86
resolvers += Resolver .sonatypeRepo(" releases" ),
87
+ resolvers ~= { old =>
88
+ if (isDroneCI) {
89
+ println(s " Using resolver: $epflArtifactory" )
90
+ epflArtifactory +: old
91
+ } else old
92
+ },
87
93
triggeredMessage in ThisBuild := Watched .clearWhenTriggered,
88
94
scalacOptions := compilerOptions,
89
95
scalacOptions in (Compile , console) := compilerOptions :+ " -Yrepl-class-based" ,
@@ -331,5 +337,8 @@ def setId(project: Project): Project = {
331
337
val newId = " scalafix-" + project.id
332
338
project.copy(base = file(newId)).settings(moduleName := newId)
333
339
}
334
-
335
340
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/" )
You can’t perform that action at this time.
0 commit comments