Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade MFA #25

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Upgrade MFA #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d20fea8
upgrade MFA to v1.1.0-beta.1
psibre Sep 18, 2018
2a511a1
update test; TextGrids are now generated directly under build/TextGrid
psibre Sep 18, 2018
3ea7265
tweak CI dependencies for linux
psibre Sep 18, 2018
152575a
tweak CI dependencies for linux
psibre Sep 18, 2018
9c7785e
upgrade linux CI environment to Ubuntu 16.04
psibre Sep 18, 2018
be1dd6f
require sudo for xenial
psibre Oct 19, 2018
eeba3a5
upgrade MFA to v1.1.0-beta.2
psibre Oct 22, 2018
18ab772
tweak JDK config
psibre Oct 22, 2018
0fe8e92
alternate workaround for Java 8 on Xenial
psibre Oct 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ language: groovy
matrix:
include:
- os: linux
group: edge
dist: xenial
sudo: required
jdk: oraclejdk8
- os: osx # OSX 10.10
osx_image: xcode6.4
Expand All @@ -19,7 +22,7 @@ matrix:
addons:
apt:
packages:
- libatlas3-base
- gfortran

script: ./gradlew check --info

Expand Down
2 changes: 1 addition & 1 deletion src/main/groovy/de/dfki/mary/voicebuilding/MaryttsKaldiMfaPlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.2'

@Override
void apply(Project project) {
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/de/dfki/mary/voicebuilding/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

Expand Down