Merge remote-tracking branch 'origin/master' into als/master

.github/workflows/ci.yml

@@ -5,25 +5,38 @@ name: CI
 
 on:
   push:
-    branches: [ master ]
+    branches: 
+      - master
+      - 'release-*'
   pull_request:
-    branches: [ master ]
+    branches: 
+      - master
   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:
@@ -32,44 +45,78 @@ 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 #####################################
 
       # Archive Repository
       - name: Archive Semantics Repository Artifact
+        if: ${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release-') }}
         uses: actions/upload-artifact@v2
         with:
           name: Semantics Repository Artifact
           path: build/de.cau.cs.kieler.semantics.repository/target/repository/
           if-no-files-found: error
 
+      # Collect and Archive all Products
+      - name: Collect All Products
+        if: ${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release-') }}
+        run: |
+          mkdir products
+          cp -r build/de.cau.cs.kieler.semantics.product.repository/target/products/sccharts_rca_* products/
+          mkdir products/cli
+          cp -r build/de.cau.cs.kieler.kicool.cli/target/exe/* products/cli
+          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 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
+        with:
+          name: All Semantics Products
+          path: products
+          if-no-files-found: error
+
       # Archive Eclipse RCA
       - name: Archive KIELER Semantics RCA Windows
         uses: actions/upload-artifact@v2
         with:
           name: KIELER RCA Windows
-          path: build/de.cau.cs.kieler.semantics.product.repository/target/products/sccharts_rca_nightly_*-win32.win32.x86_64.zip
+          path: build/de.cau.cs.kieler.semantics.product.repository/target/products/sccharts_rca_*-win32.win32.x86_64.zip
           if-no-files-found: error
 
       - name: Archive KIELER Semantics RCA Linux
         uses: actions/upload-artifact@v2
         with:
           name: KIELER RCA Linux
-          path: build/de.cau.cs.kieler.semantics.product.repository/target/products/sccharts_rca_nightly_*-linux.gtk.x86_64.tar.gz
+          path: build/de.cau.cs.kieler.semantics.product.repository/target/products/sccharts_rca_*-linux.gtk.x86_64.tar.gz
           if-no-files-found: error
 
       - name: Archive KIELER Semantics RCA MacOS
         uses: actions/upload-artifact@v2
         with:
           name: KIELER RCA MacOS
-          path: build/de.cau.cs.kieler.semantics.product.repository/target/products/sccharts_rca_nightly_*-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
@@ -80,26 +127,26 @@ jobs:
           path: build/de.cau.cs.kieler.kicool.cli/target/exe/kico.jar
           if-no-files-found: error
 
-      - name: Archive KIELER Compiler CLI Windows
-        uses: actions/upload-artifact@v2
-        with:
-          name: KIELER Compiler CLI Windows
-          path: build/de.cau.cs.kieler.kicool.cli/target/exe/kico-win.bat
-          if-no-files-found: error
+      # - name: Archive KIELER Compiler CLI Windows
+      #   uses: actions/upload-artifact@v2
+      #   with:
+      #     name: KIELER Compiler CLI Windows
+      #     path: build/de.cau.cs.kieler.kicool.cli/target/exe/kico-win.bat
+      #     if-no-files-found: error
 
-      - name: Archive KIELER Compiler CLI Linux
-        uses: actions/upload-artifact@v2
-        with:
-          name: KIELER Compiler CLI Linux
-          path: build/de.cau.cs.kieler.kicool.cli/target/exe/kico-linux
-          if-no-files-found: error
+      # - name: Archive KIELER Compiler CLI Linux
+      #   uses: actions/upload-artifact@v2
+      #   with:
+      #     name: KIELER Compiler CLI Linux
+      #     path: build/de.cau.cs.kieler.kicool.cli/target/exe/kico-linux
+      #     if-no-files-found: error
 
-      - name: Archive KIELER Compiler CLI MacOS
-        uses: actions/upload-artifact@v2
-        with:
-          name: KIELER Compiler CLI MacOS
-          path: build/de.cau.cs.kieler.kicool.cli/target/exe/kico-osx
-          if-no-files-found: error
+      # - name: Archive KIELER Compiler CLI MacOS
+      #   uses: actions/upload-artifact@v2
+      #   with:
+      #     name: KIELER Compiler CLI MacOS
+      #     path: build/de.cau.cs.kieler.kicool.cli/target/exe/kico-osx
+      #     if-no-files-found: error
 
       # Kieler Compiler Diagrams CLI
       - name: Archive KIELER Compiler Diagrams CLI Windows Jar
@@ -120,29 +167,31 @@ 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
-        uses: actions/upload-artifact@v2
-        with:
-          name: KIELER Compiler Diagrams CLI Windows
-          path: build/de.cau.cs.kieler.kicool.klighd.cli/target/exe/kicodia-win.bat
-          if-no-files-found: error
+      # - name: Archive KIELER Compiler Diagrams CLI Windows
+      #   uses: actions/upload-artifact@v2
+      #   with:
+      #     name: KIELER Compiler Diagrams CLI Windows
+      #     path: build/de.cau.cs.kieler.kicool.klighd.cli/target/exe/kicodia-win.bat
+      #     if-no-files-found: error
 
-      - name: Archive KIELER Compiler Diagrams CLI Linux
-        uses: actions/upload-artifact@v2
-        with:
-          name: KIELER Compiler Diagrams CLI Linux
-          path: build/de.cau.cs.kieler.kicool.klighd.cli/target/exe/kicodia-linux
-          if-no-files-found: error
+      # - name: Archive KIELER Compiler Diagrams CLI Linux
+      #   uses: actions/upload-artifact@v2
+      #   with:
+      #     name: KIELER Compiler Diagrams CLI Linux
+      #     path: build/de.cau.cs.kieler.kicool.klighd.cli/target/exe/kicodia-linux
+      #     if-no-files-found: error
 
-      - name: Archive KIELER Compiler Diagrams CLI MacOS
-        uses: actions/upload-artifact@v2
-        with:
-          name: KIELER Compiler Diagrams CLI MacOS
-          path: build/de.cau.cs.kieler.kicool.klighd.cli/target/exe/kicodia-osx
-          if-no-files-found: error
+      # - name: Archive KIELER Compiler Diagrams CLI MacOS
+      #   uses: actions/upload-artifact@v2
+      #   with:
+      #     name: KIELER Compiler Diagrams CLI MacOS
+      #     path: build/de.cau.cs.kieler.kicool.klighd.cli/target/exe/kicodia-osx
+      #     if-no-files-found: error
 
       # SCCharts Compiler CLI
       - name: Archive SCCharts Compiler CLI Jar
@@ -152,45 +201,87 @@ jobs:
           path: build/de.cau.cs.kieler.sccharts.cli/target/exe/scc.jar
           if-no-files-found: error
 
-      - name: Archive SCCharts Compiler CLI Windows
-        uses: actions/upload-artifact@v2
-        with:
-          name: SCCharts Compiler CLI Windows
-          path: build/de.cau.cs.kieler.sccharts.cli/target/exe/scc-win.bat
-          if-no-files-found: error
+      # - name: Archive SCCharts Compiler CLI Windows
+      #   uses: actions/upload-artifact@v2
+      #   with:
+      #     name: SCCharts Compiler CLI Windows
+      #     path: build/de.cau.cs.kieler.sccharts.cli/target/exe/scc-win.bat
+      #     if-no-files-found: error
 
-      - name: Archive SCCharts Compiler CLI Linux
-        uses: actions/upload-artifact@v2
-        with:
-          name: SCCharts Compiler CLI Linux
-          path: build/de.cau.cs.kieler.sccharts.cli/target/exe/scc-linux
-          if-no-files-found: error
+      # - name: Archive SCCharts Compiler CLI Linux
+      #   uses: actions/upload-artifact@v2
+      #   with:
+      #     name: SCCharts Compiler CLI Linux
+      #     path: build/de.cau.cs.kieler.sccharts.cli/target/exe/scc-linux
+      #     if-no-files-found: error
 
-      - name: Archive SCCharts Compiler CLI MacOS
-        uses: actions/upload-artifact@v2
-        with:
-          name: SCCharts Compiler CLI MacOS
-          path: build/de.cau.cs.kieler.sccharts.cli/target/exe/scc-osx
-          if-no-files-found: error
+      # - name: Archive SCCharts Compiler CLI MacOS
+      #   uses: actions/upload-artifact@v2
+      #   with:
+      #     name: SCCharts Compiler CLI MacOS
+      #     path: build/de.cau.cs.kieler.sccharts.cli/target/exe/scc-osx
+      #     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'

.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

README.md

@@ -1,5 +1,16 @@
 # KIELER Semantics
 
-See the [SCCharts wiki](https://rtsys.informatik.uni-kiel.de/confluence/display/KIELER/SCCharts) for further information and detailed documentation.
+*Semantics* is part of the overarching [KIELER project](https://rtsys.informatik.uni-kiel.de/kieler/) and represents research on the semantics of modeling languages, especially synchronous languages, in combination with pragmatics-aware modeling techniques.
+The focus is on Sequentially Constructive Charts (SCCharts), a successor of SyncCharts that is also synchronous state chart dialect but with sequentially constructive semantics.
+See the [SCCharts wiki pages](https://github.com/kieler/semantics/wiki) for further information and detailed documentation.
 
+The KIELER SCCharts tool provides a modeling environment for SCCharts, including specialized automatically generated graphical views, model-transformation-based compilation, and simulation.
+
+### Installation
+See the [Downloads wiki page](https://github.com/kieler/semantics/wiki/Downloads) or our quick start guide for [KIELER in Eclipse](https://github.com/kieler/semantics/wiki/quick-start-guide) or [KIELER in VS Code](https://github.com/kieler/semantics/wiki/vs-code-extensions).
+
+### Related Publications
+See [list of publication of the RTSYS group](https://www.rtsys.informatik.uni-kiel.de/en/publications).
+
+### Development
 If you want to run or develop the semantics code base, please follow the [developer Eclipse setup with Oomph](https://github.com/kieler/semantics/wiki/Developer-Eclipse-Setup-with-Oomph).

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.3.0-SNAPSHOT</version>
+  <version>1.4.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>