From 1eb06719355363c57616dd2e0f37f3e3dd3dbe42 Mon Sep 17 00:00:00 2001 From: Max Kasperowski Date: Thu, 12 Nov 2026 14:59:10 +0100 Subject: [PATCH 1/3] Change railway link opening method and parameters --- .../resources/templates/rail-controller.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/de.cau.cs.kieler.railsl/resources/templates/rail-controller.ftl b/plugins/de.cau.cs.kieler.railsl/resources/templates/rail-controller.ftl index fc8ea64..09c8b0b 100644 --- a/plugins/de.cau.cs.kieler.railsl/resources/templates/rail-controller.ftl +++ b/plugins/de.cau.cs.kieler.railsl/resources/templates/rail-controller.ftl @@ -44,7 +44,7 @@ int main(int argn, char *argv[]) { // Setup connection to the railway railway = railway_initsystem(&kicking); - railway_openlinks_udp(railway,"node%02i","/dev/ttyS0"); + railway_openlinks(railway,"railPi%i","10000"); railway_startcontrol(railway,0,0); // Create TickData struct and initialize values From 2eb10882a10b9409541073922b9d0c359b68add5 Mon Sep 17 00:00:00 2001 From: Max Kasperowski Date: Thu, 12 Nov 2026 15:02:46 +0100 Subject: [PATCH 2/3] Delete legacy openlinks_udp function Removed legacy railway_openlinks_udp function. --- .../resources/railway/modules/railway.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/plugins/de.cau.cs.kieler.railsl/resources/railway/modules/railway.c b/plugins/de.cau.cs.kieler.railsl/resources/railway/modules/railway.c index 01efc47..8be29d3 100644 --- a/plugins/de.cau.cs.kieler.railsl/resources/railway/modules/railway.c +++ b/plugins/de.cau.cs.kieler.railsl/resources/railway/modules/railway.c @@ -162,10 +162,6 @@ int railway_openlinks(railway_t *railway, char *hostformat, char *portformat) { return 0; } -// TODO: Legacy openlinks_udp function added for girlsday tool -int railway_openlinks_udp(railway_t *railway, char *nodeName, char *device) { - return railway_openlinks(railway, "railway.rtsys.informatik.uni-kiel.de", "2001%i"); -} /** * Start the system (and the control thread) after all railPis From 9208e56bc6b92a9bbcf441a631553cd94f4c8c06 Mon Sep 17 00:00:00 2001 From: Max Kasperowski Date: Thu, 12 Nov 2026 15:18:58 +0100 Subject: [PATCH 3/3] Upgrade actions and add Maven installation step Updated GitHub Actions to use newer versions of actions and added Maven installation step. --- .github/workflows/product.yml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/.github/workflows/product.yml b/.github/workflows/product.yml index be98951..3e30043 100644 --- a/.github/workflows/product.yml +++ b/.github/workflows/product.yml @@ -18,12 +18,12 @@ jobs: steps: - name: Checkout RailSL - uses: actions/checkout@v4 + uses: actions/checkout@v7 with: path: railsl - name: Checkout Kieler Semantics - uses: actions/checkout@v4 + uses: actions/checkout@v7 with: repository: kieler/semantics path: semantics @@ -33,9 +33,17 @@ jobs: with: java-version: '21' distribution: 'temurin' + + - name: Install Maven + run: | + MAVEN_VERSION=3.9.16 + curl -fsSLO "https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz" + tar -xzf "apache-maven-${MAVEN_VERSION}-bin.tar.gz" + echo "$PWD/apache-maven-${MAVEN_VERSION}/bin" >> "$GITHUB_PATH" + rm "apache-maven-${MAVEN_VERSION}-bin.tar.gz" - name: Cache local Maven repository - uses: actions/cache@v4 + uses: actions/cache@v6 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('.github/workflows/*.*', '**/pom.xml', '**/META-INF/MANIFEST.MF', 'build/de.cau.cs.kieler.semantics.targetplatform/de.cau.cs.kieler.semantics.targetplatform.target') }} @@ -57,21 +65,21 @@ jobs: MAVEN_OPTS: '-Xmx2048M' - name: Archive RailSL RCA Linux - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: RailSL Linux path: railsl/build/product/target/products/railway_rca_*-linux.gtk.x86_64.tar.gz if-no-files-found: error - name: Archive RailSL RCA Linux Arm64 - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: RailSL Linux ARM64 path: railsl/build/product/target/products/railway_rca_*-linux.gtk.aarch64.tar.gz if-no-files-found: error - name: Archive RailSL Compiler CLI Jar - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: RailSL Compiler CLI Jar path: railsl/build/cli/target/exe/kico-railsl.jar