File tree Expand file tree Collapse file tree 3 files changed +20
-5
lines changed Expand file tree Collapse file tree 3 files changed +20
-5
lines changed Original file line number Diff line number Diff line change @@ -31,15 +31,15 @@ before_install:
31
31
fi
32
32
# Only do an assemble when we aren't building a pull request
33
33
install :
34
- - ' [ "${TRAVIS_PULL_REQUEST}" = "false" ] && ./gradlew jfxNative --no-daemon --stacktrace || ./gradlew --stacktrace '
34
+ - ' [ "${TRAVIS_PULL_REQUEST}" = "false" ] && ./gradlew jfxNative --no-daemon --stacktrace -Dscan || ./gradlew --stacktrace -Dscan '
35
35
36
36
script :
37
37
# Only run code generation tests on OSX -- linux requires sudo to install OpenCV dependencies, and that environment
38
38
# will not be able to run MainWindowTest.testDragOperationFromPaletteToPipeline
39
39
- |
40
40
if [[ "$TRAVIS_OS_NAME" == "osx" ]];
41
- then ./gradlew check jacocoTestReport jacocoRootReport --stacktrace -Pheadless=true -PlogTests -Pgeneration -PjniLocation=$HOME/opencv/jni;
42
- else ./gradlew check jacocoTestReport jacocoRootReport --stacktrace -Pheadless=true -PlogTests;
41
+ then ./gradlew check jacocoTestReport jacocoRootReport --stacktrace -Pheadless=true -PlogTests -Dscan - Pgeneration -PjniLocation=$HOME/opencv/jni;
42
+ else ./gradlew check jacocoTestReport jacocoRootReport --stacktrace -Pheadless=true -PlogTests -Dscan ;
43
43
fi
44
44
45
45
after_success :
Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ build_script:
6
6
7
7
# to run your custom scripts instead of automatic tests
8
8
test_script :
9
- - gradlew.bat check jacocoTestReport jacocoRootReport --stacktrace -Pheadless=true -PlogTests
9
+ - gradlew.bat check jacocoTestReport jacocoRootReport --stacktrace -Pheadless=true -PlogTests -Dscan
10
10
11
11
platform :
12
12
- x64
Original file line number Diff line number Diff line change @@ -25,6 +25,7 @@ import edu.wpi.first.wpilib.opencv.installer.Installer
25
25
import edu.wpi.first.wpilib.opencv.installer.platform.Platform
26
26
27
27
plugins {
28
+ id ' com.gradle.build-scan' version ' 1.3'
28
29
id ' java'
29
30
id ' idea'
30
31
id ' eclipse'
@@ -35,6 +36,18 @@ plugins {
35
36
}
36
37
apply plugin : ' nebula-aggregate-javadocs'
37
38
39
+ buildScan {
40
+ licenseAgreementUrl = ' https://gradle.com/terms-of-service'
41
+ licenseAgree = ' yes'
42
+ }
43
+
44
+ allprojects {
45
+ // Hacky fix to make the build work
46
+ tasks. withType(CreateStartScripts ) {
47
+ mainClassName = " someRandomGiberish" + Math . random()
48
+ }
49
+ }
50
+
38
51
def getGitCommit = { ->
39
52
def stdout = new ByteArrayOutputStream ()
40
53
exec {
@@ -372,9 +385,11 @@ project (":ui:preloader") {
372
385
apply plugin : ' jacoco'
373
386
apply plugin : ' application'
374
387
388
+ mainClassName = " edu.wpi.grip.preloader.GripPreloader"
389
+
375
390
task run(overwrite : true , type : JavaExec ) {
376
391
classpath = sourceSets. main. runtimeClasspath
377
- main = ' edu.wpi.grip.preloader.GripPreloader '
392
+ main = mainClassName
378
393
args ' windowed'
379
394
}
380
395
}
You can’t perform that action at this time.
0 commit comments