Skip to content

Commit 55d8acc

Browse files
committed
Merge pull request #188 from JLLeitschuh/build/fixReleaseArtifacts
Build: Fix release artifacts
2 parents 6d13835 + 22a371d commit 55d8acc

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ after_failure: #Run again with debug info enabled
2727

2828
after_success:
2929
- bash <(curl -s https://codecov.io/bash) # Code Coverage Reporting
30-
- ./gradlew javadoc
30+
- ./gradlew aggregateJavadocs
3131
- .travis-scripts/push-javadoc-to-gh-pages.sh
3232
- .travis-scripts/before-deploy.sh
3333

@@ -53,7 +53,7 @@ deploy:
5353
api_key:
5454
secure: bdjiFXG3VBcM1iyxeputsWA9vHxgLNcxRB1i0REDNAnIEvDWpAdVr1jPBejeiOEw9s+k6EItATvQ2I7Xp5iKnYaXn0NuHzM3OSY8WNVCc+gBTaQwkijPBqi/vEXaO502CscW+H2U26QZGS/jJiUuieeErtzCNcWmCv8SRc5NFOVYdSlhAmp+aPeu2YwuweiMZNVquYM2hx7murghOYSF5hQTKq4/zrziENVi78XZS8rJFmxwOGqNj1GBLul2F9poIPjzDbPVJLeXTJEY+N3aYGJ4GyZYf6p8ynDO/v043/GuOAyNfkgSwhCcTQlmLG/mm6P9CUMoDQR9klh2eDswgrIP4rGLwILg3035nqHqwgTIKVXfspni3P/65siS6lXV0M5flEkRysMBr1GQhaIEUM32ArreMzAtC2Vn2CviKG0TwLmxyd/7W3JdoX4KrHAcKBwbqFDImWw43S6N63oTUEw6GjrI+CndwgF9RNgr5SAyS28LFXViOJe7JlGVUNU33kMNpEJxzVREzkJsO8aicaZTrvDniFOfg2WhrAyhjxmh4/IOHDE6qgtxw+2+TUzMlwdzdxb90BeXg2XfMichmKfQYQFEmZntCZcoHHDG5jbCTyAvFuOv6tdPjpr69QjiEJhEbohw8CEwoGhy1kxxQcCDCfABrOTivJ39Ui8MC6k=
5555
file_glob: true
56-
file: "build/distributions/*.deb"
56+
file: "ui/build/distributions/*.deb"
5757
skip_cleanup: true
5858
on:
5959
repo: WPIRoboticsProjects/GRIP

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ after_build:
1515
- dir build /s
1616

1717
artifacts:
18-
- path: build\distributions\*.exe
18+
- path: ui\build\distributions\*.exe
1919

2020
deploy:
2121
provider: GitHub

build.gradle

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
buildscript {
2+
repositories { jcenter() }
3+
4+
dependencies {
5+
classpath 'com.netflix.nebula:gradle-aggregate-javadocs-plugin:2.2.+'
6+
}
7+
}
18
plugins {
29
id 'java'
310
id 'idea'
@@ -6,6 +13,8 @@ plugins {
613
id 'com.google.osdetector' version '1.4.0'
714
id 'com.github.johnrengelman.shadow' version '1.2.2'
815
}
16+
apply plugin: 'nebula-aggregate-javadocs'
17+
918

1019
allprojects {
1120
apply plugin: 'java'
@@ -35,6 +44,7 @@ allprojects {
3544
tasks.withType(Javadoc) {
3645
source compileJava.source
3746
options.addStringOption('Xdoclint:all,-html', '-quiet')
47+
failOnError false
3848
}
3949

4050
// Turn on test results

0 commit comments

Comments
 (0)