Merge branch 'master' into nre/tik-merge2

kieler · May 6, 2024 · aedc6e4 · aedc6e4
2 parents fd5104b + 52122a1
commit aedc6e4
Show file tree

Hide file tree

Showing 376 changed files with 2,388 additions and 1,207 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,19 +14,29 @@ on:
   workflow_dispatch: # manual triggering, for debugging purposes
 
 jobs:
-  mavenBuilds:
-
+  buildAll:
+    name: Build and Test
     runs-on: ubuntu-latest
 
     steps:
-      # Setup
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
+      # Checkout repositories
+      - name: Checkout Semantics
+        uses: actions/checkout@v4
+
+      - name: Checkout Models
+        uses: actions/checkout@v4
+        with:
+          repository: kieler/models
+          path: models
+
+      # Provide Java
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
 
+      # Configure maven artifact caching
       - name: Cache local Maven repository
         uses: actions/cache@v2
         with:
@@ -35,13 +45,26 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-
 
-      # Maven build update site
-      #- name: Build update site
-      #  run: MAVEN_OPTS="-Xmx2048M" mvn --update-snapshots clean verify -P semantics --file build/pom.xml
+      # Maven build products
+      - name: Build Products and Run Tests
+        # Start with xvfb for testing diagram generation with piccolo (see Klighd test config)
+        run:
+          Xvfb -ac > /dev/null 2>&1 & mvn --update-snapshots --fail-at-end clean verify -P semantics.all --file build/pom.xml
+        env:
+          models_repository: '[${{github.workspace}}/models]'
+          MAVEN_OPTS: '-Xmx2048M'
+          DISPLAY: ':0'
 
-      # Maven build products (including update site)
-      - name: Build products
-        run: MAVEN_OPTS="-Xmx2048M" mvn --update-snapshots clean package -P semantics.product --file build/pom.xml
+      # Produce test report
+      - name: Produce test report
+        uses: dorny/test-reporter@v1
+        if: always()
+        with:
+          name: Test Report
+          path: test/*/target/surefire-reports/*.xml
+          reporter: java-junit
+          fail-on-error: true
+          max-annotations: '50'
 
       ##################################### ALL THE ARTIFACTS #####################################
 
@@ -65,7 +88,7 @@ jobs:
           cp -r build/de.cau.cs.kieler.kicool.klighd.cli/target/exe/* products/cli
           cp -r build/de.cau.cs.kieler.sccharts.cli/target/exe/* products/cli
           mkdir products/ls
-          cp -r build/de.cau.cs.kieler.language.server.cli/target/exe/* products/ls
+          cp build/de.cau.cs.kieler.language.server.cli/target/de.cau.cs.kieler.language.server.cli-*-app.jar products/ls
       - name: Archive All Products
         if: ${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release-') }}
         uses: actions/upload-artifact@v2
@@ -93,7 +116,7 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: KIELER RCA MacOS
-          path: build/de.cau.cs.kieler.semantics.product.repository/target/products/sccharts_rca_*-macosx.cocoa.x86_64.tar.gz
+          path: build/de.cau.cs.kieler.semantics.product.repository/target/products/sccharts_rca_*-macosx.cocoa.*.tar.gz
           if-no-files-found: error
 
       # Kieler Compiler CLI
@@ -144,7 +167,9 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: KIELER Compiler Diagrams CLI MacOS Jar
-          path: build/de.cau.cs.kieler.kicool.klighd.cli/target/exe/kicodia.osx.jar
+          path: |
+            build/de.cau.cs.kieler.kicool.klighd.cli/target/exe/kicodia.osx.jar
+            build/de.cau.cs.kieler.kicool.klighd.cli/target/exe/kicodia.osx.aarch64.jar
           if-no-files-found: error
 
       # - name: Archive KIELER Compiler Diagrams CLI Windows
@@ -198,23 +223,65 @@ jobs:
       #     if-no-files-found: error
 
       # Kieler Language Server
-      - name: Archive KIELER Language Server Windows
+      - name: Archive KIELER Language Server
         uses: actions/upload-artifact@v2
         with:
-          name: KIELER Language Server Windows
-          path: build/de.cau.cs.kieler.language.server.cli/target/exe/kieler-language-server.win.jar
+          name: KIELER Language Server
+          path: build/de.cau.cs.kieler.language.server.cli/target/de.cau.cs.kieler.language.server.cli-*-app.jar
           if-no-files-found: error
 
-      - name: Archive KIELER Language Server Linux
-        uses: actions/upload-artifact@v2
+  testMac:
+    name: Test CLI (MacOS)
+    runs-on: macos-latest
+    needs: buildAll
+
+    steps:
+      # Setup
+      - uses: actions/checkout@v2
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
         with:
-          name: KIELER Language Server Linux
-          path: build/de.cau.cs.kieler.language.server.cli/target/exe/kieler-language-server.linux.jar
-          if-no-files-found: error
+          java-version: '17'
+          distribution: 'adopt'
+
+      - name: Cache local Maven repository
+        uses: actions/cache@v2
+        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') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
 
-      - name: Archive KIELER Language Server MacOS
-        uses: actions/upload-artifact@v2
+      # Maven test CLI
+      - name: Tests CLI
+        run: mvn --update-snapshots clean verify -P semantics.cli.test --file build/pom.xml
+        env:
+          MAVEN_OPTS: '-Xmx2048M'
+
+  testWin:
+    name: Test CLI (Windows)
+    runs-on: windows-latest
+    needs: buildAll
+
+    steps:
+      # Setup
+      - uses: actions/checkout@v2
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
         with:
-          name: KIELER Language Server MacOS
-          path: build/de.cau.cs.kieler.language.server.cli/target/exe/kieler-language-server.osx.jar
-          if-no-files-found: error
+          java-version: '17'
+          distribution: 'adopt'
+
+      - name: Cache local Maven repository
+        uses: actions/cache@v2
+        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') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+
+      # Maven test CLI
+      - name: Tests CLI
+        run: mvn --update-snapshots clean verify -P semantics.cli.test --file build/pom.xml
+        env:
+          MAVEN_OPTS: '-Xmx2048M'
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,5 @@ xtend-gen/
 target/
 **/.antlr-generator
 build/de.cau.cs.kieler.semantics.product.repository/de.cau.cs.kieler.core.product/
-dependencies.txt
+dependencies.txt
+.tycho-consumer-pom.xml
diff --git a/build/de.cau.cs.kieler.kicool.cli/pom.xml b/build/de.cau.cs.kieler.kicool.cli/pom.xml
@@ -2,14 +2,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <version>1.4.0-SNAPSHOT</version>
+  <version>1.5.0-SNAPSHOT</version>
   <artifactId>de.cau.cs.kieler.kicool.cli</artifactId>
   <packaging>eclipse-repository</packaging>
   <name>KIELER Compiler CLI</name>
 
   <parent>
     <groupId>de.cau.cs.kieler</groupId>
-    <artifactId>parent</artifactId>
+    <artifactId>semantics</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>

diff --git a/build/de.cau.cs.kieler.kicool.klighd.cli/pom.xml b/build/de.cau.cs.kieler.kicool.klighd.cli/pom.xml
@@ -2,14 +2,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <version>1.4.0-SNAPSHOT</version>
+  <version>1.5.0-SNAPSHOT</version>
   <artifactId>de.cau.cs.kieler.kicool.klighd.cli</artifactId>
   <packaging>eclipse-repository</packaging>
   <name>KIELER Compiler and Diagrams CLI</name>
 
   <parent>
     <groupId>de.cau.cs.kieler</groupId>
-    <artifactId>parent</artifactId>
+    <artifactId>semantics</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>

diff --git a/build/de.cau.cs.kieler.language.server.cli/.project b/build/de.cau.cs.kieler.language.server.cli/.project
@@ -6,12 +6,12 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>org.eclipse.pde.UpdateSiteBuilder</name>
+			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.pde.UpdateSiteNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
diff --git a/build/de.cau.cs.kieler.language.server.cli/category.xml b/build/de.cau.cs.kieler.language.server.cli/category.xml