From b1a413c3ed023028cb16206d2fe4e34b7701797e Mon Sep 17 00:00:00 2001 From: Ingmar Steiner Date: Sun, 5 May 2024 15:32:07 +0200 Subject: [PATCH 1/6] Add lexicon as submodule in composite build --- .gitmodules | 3 +++ marytts-lexicon-hsb | 1 + settings.gradle | 1 + 3 files changed, 5 insertions(+) create mode 100644 .gitmodules create mode 160000 marytts-lexicon-hsb diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..b7214f9 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "marytts-lexicon-hsb"] + path = marytts-lexicon-hsb + url = https://github.com/marytts/marytts-lexicon-hsb.git diff --git a/marytts-lexicon-hsb b/marytts-lexicon-hsb new file mode 160000 index 0000000..9d2eef5 --- /dev/null +++ b/marytts-lexicon-hsb @@ -0,0 +1 @@ +Subproject commit 9d2eef5907ec9c2bd4717543ed4025137008965d diff --git a/settings.gradle b/settings.gradle index 3c8552d..e849766 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,2 @@ rootProject.name = 'marytts-lang-hsb' +includeBuild 'marytts-lexicon-hsb' From ab13b3a5f8d86b7438e807ffc6fa1d2c9d8f586b Mon Sep 17 00:00:00 2001 From: Ingmar Steiner Date: Sun, 5 May 2024 15:45:16 +0200 Subject: [PATCH 2/6] Checkout submodules in GitHub Actions --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a299e4d..9c95689 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,6 +16,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4.1.1 + with: + submodules: true - uses: actions/setup-java@v4.0.0 with: From be5dc8d73f1a81a8d7d5ae883aebe5ab60a97029 Mon Sep 17 00:00:00 2001 From: Ingmar Steiner Date: Sun, 12 May 2024 09:57:55 +0200 Subject: [PATCH 3/6] Upgrade lexicon submodule to v0.2.0 --- marytts-lexicon-hsb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/marytts-lexicon-hsb b/marytts-lexicon-hsb index 9d2eef5..23473c5 160000 --- a/marytts-lexicon-hsb +++ b/marytts-lexicon-hsb @@ -1 +1 @@ -Subproject commit 9d2eef5907ec9c2bd4717543ed4025137008965d +Subproject commit 23473c5c537765b333906a7ea9b87c0524f71de8 From 19dd7cffe532857b8bf75304785319c5a6843e13 Mon Sep 17 00:00:00 2001 From: Ingmar Steiner Date: Sun, 12 May 2024 09:58:43 +0200 Subject: [PATCH 4/6] Upgrade lexicon to v0.2.0 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 80008d7..7af379d 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ marytts { dependencies { implementation group: 'org.apache.commons', name: 'commons-csv', version: '1.9.0' - runtimeOnly group: 'de.dfki.mary', name: 'marytts-lexicon-hsb', version: '0.1.1' + runtimeOnly group: 'de.dfki.mary', name: 'marytts-lexicon-hsb', version: '0.2.0' } java { From 21d6775aec0d7cffbc86a512acbaebb37c520dc9 Mon Sep 17 00:00:00 2001 From: Ingmar Steiner Date: Sun, 12 May 2024 09:59:49 +0200 Subject: [PATCH 5/6] Drop lexicon submodule from composite build, GitHub Actions --- .github/workflows/main.yml | 2 -- .gitmodules | 3 --- marytts-lexicon-hsb | 1 - settings.gradle | 1 - 4 files changed, 7 deletions(-) delete mode 100644 .gitmodules delete mode 160000 marytts-lexicon-hsb diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9c95689..a299e4d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,8 +16,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4.1.1 - with: - submodules: true - uses: actions/setup-java@v4.0.0 with: diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index b7214f9..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "marytts-lexicon-hsb"] - path = marytts-lexicon-hsb - url = https://github.com/marytts/marytts-lexicon-hsb.git diff --git a/marytts-lexicon-hsb b/marytts-lexicon-hsb deleted file mode 160000 index 23473c5..0000000 --- a/marytts-lexicon-hsb +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 23473c5c537765b333906a7ea9b87c0524f71de8 diff --git a/settings.gradle b/settings.gradle index e849766..3c8552d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1 @@ rootProject.name = 'marytts-lang-hsb' -includeBuild 'marytts-lexicon-hsb' From e2cbf5be90f953e749fcc0a9ad779a45dc83e735 Mon Sep 17 00:00:00 2001 From: Ingmar Steiner Date: Sun, 12 May 2024 10:00:42 +0200 Subject: [PATCH 6/6] Update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e527dbe..ee107e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ Upper Sorbian language component for MaryTTS [Unreleased] ------------ +### Changed + +- Upgraded lexicon to v0.2.0 + [v0.1.2] - 2024-03-21 ---------------------