Skip to content

Commit 793a652

Browse files
committed
Merge pull request GoogleCloudPlatform#110 from dhalperi/pr108-take2
Disable Maven forking in Travis-CI to fix build issues
2 parents ea0e7bb + 47178ec commit 793a652

File tree

2 files changed

+13
-24
lines changed

2 files changed

+13
-24
lines changed

.travis.yml

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,18 @@ notifications:
99
on_success: change
1010
on_failure: always
1111

12-
os:
13-
- linux
14-
- osx
15-
16-
env:
17-
matrix:
18-
- CUSTOM_JDK="default"
19-
- CUSTOM_JDK="oraclejdk8"
20-
- CUSTOM_JDK="oraclejdk7"
21-
- CUSTOM_JDK="openjdk7"
22-
2312
matrix:
24-
exclude:
25-
# On OSX, run with default JDK only.
26-
- os: osx
27-
env: CUSTOM_JDK="oraclejdk8"
28-
- os: osx
29-
env: CUSTOM_JDK="oraclejdk7"
30-
- os: osx
31-
env: CUSTOM_JDK="openjdk7"
32-
# On Linux, run with specific JDKs only.
33-
- os: linux
34-
env: CUSTOM_JDK="default"
13+
include:
14+
# On OSX, run with default JDK only.
15+
- os: osx
16+
env: MAVEN_OVERRIDE=""
17+
# On Linux, run with specific JDKs only.
18+
- os: linux
19+
env: CUSTOM_JDK="oraclejdk8" MAVEN_OVERRIDE="-DforkCount=0"
20+
- os: linux
21+
env: CUSTOM_JDK="oraclejdk7" MAVEN_OVERRIDE="-DforkCount=0"
22+
- os: linux
23+
env: CUSTOM_JDK="openjdk7" MAVEN_OVERRIDE="-DforkCount=0"
3524

3625
before_install:
3726
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then export JAVA_HOME=$(/usr/libexec/java_home); fi
@@ -42,5 +31,5 @@ install:
4231

4332
script:
4433
- travis_retry mvn versions:set -DnewVersion=manual_build
45-
- travis_retry mvn install -U
34+
- travis_retry mvn $MAVEN_OVERRIDE install -U
4635
- travis_retry travis/test_wordcount.sh

examples/src/main/java/com/google/cloud/dataflow/examples/WindowedWordCount.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ public static void main(String[] args) throws IOException {
251251
.to(getTableReference(options))
252252
.withSchema(getSchema())
253253
.withCreateDisposition(BigQueryIO.Write.CreateDisposition.CREATE_IF_NEEDED)
254-
.withWriteDisposition(BigQueryIO.Write.WriteDisposition.WRITE_TRUNCATE));
254+
.withWriteDisposition(BigQueryIO.Write.WriteDisposition.WRITE_APPEND));
255255

256256
PipelineResult result = pipeline.run();
257257

0 commit comments

Comments
 (0)