From d20fea89e2ece0b049b3687a1536afc1b42d0518 Mon Sep 17 00:00:00 2001 From: Ingmar Steiner <steiner@coli.uni-saarland.de> Date: Tue, 18 Sep 2018 13:32:03 +0200 Subject: [PATCH 1/9] upgrade MFA to v1.1.0-beta.1 --- .../de/dfki/mary/voicebuilding/MaryttsKaldiMfaPlugin.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/groovy/de/dfki/mary/voicebuilding/MaryttsKaldiMfaPlugin.groovy b/src/main/groovy/de/dfki/mary/voicebuilding/MaryttsKaldiMfaPlugin.groovy index 9d77ec1..d1f6a36 100644 --- a/src/main/groovy/de/dfki/mary/voicebuilding/MaryttsKaldiMfaPlugin.groovy +++ b/src/main/groovy/de/dfki/mary/voicebuilding/MaryttsKaldiMfaPlugin.groovy @@ -7,7 +7,7 @@ import org.gradle.internal.os.OperatingSystem class MaryttsKaldiMfaPlugin implements Plugin<Project> { - final String mfaVersion = '1.0.0' + final String mfaVersion = '1.1.0-beta.1' @Override void apply(Project project) { From 2a511a121066ee94d815d5cc31845866d61919ae Mon Sep 17 00:00:00 2001 From: Ingmar Steiner <steiner@coli.uni-saarland.de> Date: Tue, 18 Sep 2018 13:47:53 +0200 Subject: [PATCH 2/9] update test; TextGrids are now generated directly under build/TextGrid --- src/test/resources/de/dfki/mary/voicebuilding/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/resources/de/dfki/mary/voicebuilding/build.gradle b/src/test/resources/de/dfki/mary/voicebuilding/build.gradle index b96c16d..bd11dba 100644 --- a/src/test/resources/de/dfki/mary/voicebuilding/build.gradle +++ b/src/test/resources/de/dfki/mary/voicebuilding/build.gradle @@ -90,7 +90,7 @@ task testUnpackMFA { task testRunForcedAlignment { dependsOn runForcedAlignment doLast { - assert fileTree("$buildDir/TextGrid/forcedAlignment").include('*.TextGrid').files + assert fileTree("$buildDir/TextGrid").include('*.TextGrid').files } } From 3ea72656fe5e064ac5191e908f733c761c2c8ebf Mon Sep 17 00:00:00 2001 From: Ingmar Steiner <steiner@coli.uni-saarland.de> Date: Tue, 18 Sep 2018 14:47:04 +0200 Subject: [PATCH 3/9] tweak CI dependencies for linux --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3e1ab6a..20fc35c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ matrix: addons: apt: packages: - - libatlas3-base + - libstdc++6 script: ./gradlew check --info From 152575ae00c075516e5b0fa691f1550786b4fbd4 Mon Sep 17 00:00:00 2001 From: Ingmar Steiner <steiner@coli.uni-saarland.de> Date: Tue, 18 Sep 2018 14:52:07 +0200 Subject: [PATCH 4/9] tweak CI dependencies for linux --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 20fc35c..ba63df6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ matrix: addons: apt: packages: - - libstdc++6 + - gfortran script: ./gradlew check --info From 9c7785e4a8ebc36a85bf69a0b53809dcd45b600c Mon Sep 17 00:00:00 2001 From: Ingmar Steiner <steiner@coli.uni-saarland.de> Date: Tue, 18 Sep 2018 15:19:10 +0200 Subject: [PATCH 5/9] upgrade linux CI environment to Ubuntu 16.04 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index ba63df6..e5ed387 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ language: groovy matrix: include: - os: linux + dist: xenial jdk: oraclejdk8 - os: osx # OSX 10.10 osx_image: xcode6.4 From be1dd6f25f61102b8238327e097f76e69a1420b6 Mon Sep 17 00:00:00 2001 From: Ingmar Steiner <steiner@coli.uni-saarland.de> Date: Fri, 19 Oct 2018 17:30:46 +0200 Subject: [PATCH 6/9] require sudo for xenial --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index e5ed387..83efb6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ matrix: include: - os: linux dist: xenial + sudo: required jdk: oraclejdk8 - os: osx # OSX 10.10 osx_image: xcode6.4 From eeba3a58cf59e3a27a458faaf83caa4624533016 Mon Sep 17 00:00:00 2001 From: Ingmar Steiner <steiner@coli.uni-saarland.de> Date: Mon, 22 Oct 2018 11:14:43 +0200 Subject: [PATCH 7/9] upgrade MFA to v1.1.0-beta.2 --- .../de/dfki/mary/voicebuilding/MaryttsKaldiMfaPlugin.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/groovy/de/dfki/mary/voicebuilding/MaryttsKaldiMfaPlugin.groovy b/src/main/groovy/de/dfki/mary/voicebuilding/MaryttsKaldiMfaPlugin.groovy index d1f6a36..d9b33ee 100644 --- a/src/main/groovy/de/dfki/mary/voicebuilding/MaryttsKaldiMfaPlugin.groovy +++ b/src/main/groovy/de/dfki/mary/voicebuilding/MaryttsKaldiMfaPlugin.groovy @@ -7,7 +7,7 @@ import org.gradle.internal.os.OperatingSystem class MaryttsKaldiMfaPlugin implements Plugin<Project> { - final String mfaVersion = '1.1.0-beta.1' + final String mfaVersion = '1.1.0-beta.2' @Override void apply(Project project) { From 18ab772a71a7291f4a7b5e40ddaee8cfcf18d7a8 Mon Sep 17 00:00:00 2001 From: Ingmar Steiner <steiner@coli.uni-saarland.de> Date: Mon, 22 Oct 2018 16:14:31 +0200 Subject: [PATCH 8/9] tweak JDK config jdk key seems to be ignored in xenial env --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 83efb6a..d2c24ab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,8 @@ matrix: - os: linux dist: xenial sudo: required - jdk: oraclejdk8 + script: + - jdk_switcher use oraclejdk8 - os: osx # OSX 10.10 osx_image: xcode6.4 - os: osx # OSX 10.11 From 0fe8e926b1b4370662ec88c8fc5cdf60df8cbd7a Mon Sep 17 00:00:00 2001 From: Ingmar Steiner <steiner@coli.uni-saarland.de> Date: Tue, 23 Oct 2018 06:40:48 +0200 Subject: [PATCH 9/9] alternate workaround for Java 8 on Xenial from travis-ci/travis-ci#10212 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d2c24ab..f8319ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,10 +7,10 @@ language: groovy matrix: include: - os: linux + group: edge dist: xenial sudo: required - script: - - jdk_switcher use oraclejdk8 + jdk: oraclejdk8 - os: osx # OSX 10.10 osx_image: xcode6.4 - os: osx # OSX 10.11