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:
3131 fi
3232# Only do an assemble when we aren't building a pull request
3333install :
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 '
3535
3636script :
3737 # Only run code generation tests on OSX -- linux requires sudo to install OpenCV dependencies, and that environment
3838 # will not be able to run MainWindowTest.testDragOperationFromPaletteToPipeline
3939 - |
4040 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 ;
4343 fi
4444
4545after_success :
Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ build_script:
66
77# to run your custom scripts instead of automatic tests
88test_script :
9- - gradlew.bat check jacocoTestReport jacocoRootReport --stacktrace -Pheadless=true -PlogTests
9+ - gradlew.bat check jacocoTestReport jacocoRootReport --stacktrace -Pheadless=true -PlogTests -Dscan
1010
1111platform :
1212 - x64
Original file line number Diff line number Diff line change @@ -25,6 +25,7 @@ import edu.wpi.first.wpilib.opencv.installer.Installer
2525import edu.wpi.first.wpilib.opencv.installer.platform.Platform
2626
2727plugins {
28+ id ' com.gradle.build-scan' version ' 1.3'
2829 id ' java'
2930 id ' idea'
3031 id ' eclipse'
@@ -35,6 +36,18 @@ plugins {
3536}
3637apply plugin : ' nebula-aggregate-javadocs'
3738
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+
3851def getGitCommit = { ->
3952 def stdout = new ByteArrayOutputStream ()
4053 exec {
@@ -372,9 +385,11 @@ project (":ui:preloader") {
372385 apply plugin : ' jacoco'
373386 apply plugin : ' application'
374387
388+ mainClassName = " edu.wpi.grip.preloader.GripPreloader"
389+
375390 task run(overwrite : true , type : JavaExec ) {
376391 classpath = sourceSets. main. runtimeClasspath
377- main = ' edu.wpi.grip.preloader.GripPreloader '
392+ main = mainClassName
378393 args ' windowed'
379394 }
380395}
You can’t perform that action at this time.
0 commit comments