Skip to content

Commit 88d80ef

Browse files
authored
Merge pull request #891 from korpling/fix-882
Copy and adapt RST vis implementation from latest ANNIS 3
2 parents 915da44 + 5d4635a commit 88d80ef

File tree

6 files changed

+471
-307
lines changed

6 files changed

+471
-307
lines changed

.github/workflows/deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ name: Deploy ANNIS
66
jobs:
77
deploy_release_binaries:
88
name: Deploy release binaries
9-
runs-on: ubuntu-20.04
9+
runs-on: ubuntu-22.04
1010
steps:
1111
- name: Checkout
1212
uses: actions/checkout@v2
@@ -33,7 +33,7 @@ jobs:
3333
env:
3434
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3535
deploy_documentation:
36-
runs-on: ubuntu-20.04
36+
runs-on: ubuntu-22.04
3737
steps:
3838
- name: Checkout
3939
uses: actions/checkout@v1

.github/workflows/test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
jobs:
99
test_jdk8:
1010
name: Execute all automated tests JDK 8
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-22.04
1212
steps:
1313
- name: Checkout
1414
uses: actions/checkout@v4
@@ -34,7 +34,7 @@ jobs:
3434
run: mvn install
3535
test_jdk11:
3636
name: Execute all automated tests on JDK 11
37-
runs-on: ubuntu-20.04
37+
runs-on: ubuntu-22.04
3838
steps:
3939
- name: Checkout
4040
uses: actions/checkout@v4
@@ -63,7 +63,7 @@ jobs:
6363
run: mvn install
6464
test_jdk17:
6565
name: Execute all automated tests on JDK 17
66-
runs-on: ubuntu-20.04
66+
runs-on: ubuntu-22.04
6767
steps:
6868
- name: Checkout
6969
uses: actions/checkout@v2
@@ -96,7 +96,7 @@ jobs:
9696

9797
test_docs:
9898
name: Test documentation
99-
runs-on: ubuntu-20.04
99+
runs-on: ubuntu-22.04
100100
steps:
101101
- name: Checkout
102102
uses: actions/checkout@v2

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
55

66
## [Unreleased]
77

8+
## Added
9+
10+
- Backport support for RST++/RS4 features (secondary edges with signals) from ANNIS 3.
11+
See <https://github.com/gucorpling/peppermodules-rs4module> and <https://github.com/korpling/pepperModules-RSTModules/pull/7>.
12+
813
## [4.13.0] - 2025-04-15
914

1015
### Fixed

0 commit comments

Comments
 (0)