fix: improving unit tests, improving ci workflows

Frnd-me · Frnd-me · commit 386130d51449 · 2025-09-09T17:09:07.000+02:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -6,6 +6,8 @@ on:
     branches: [ "develop" ]
 jobs:
   Build:
+    if: github.repository == 'CollaborativeStateMachines/Cirrina'
+    name: Build and Test
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -36,7 +38,6 @@ jobs:
       - name: Publish Test Report
         uses: mikepenz/action-junit-report@v3
         with:
-          commit: ${{ github.event.workflow_run.head_sha }}
           report_paths: 'build/test-results/test/TEST-*.xml'
           fail_on_failure: true
           require_tests: true
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -1,9 +1,14 @@
 name: Publish Docker image
 on:
   release:
-    types: [ published ]
+    types: [published]
+  push:
+    branches:
+      - master
+      - develop
 jobs:
   push_to_registry:
+    if: github.repository == 'CollaborativeStateMachines/Cirrina'
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     permissions:
@@ -26,6 +31,15 @@ jobs:
         uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
         with:
           images: marlonetheredgeuibk/cirrina
+          tags: |
+            type=semver,pattern={{version}},enable=${{ github.event_name == 'release' }}
+            type=raw,value=stable,enable=${{ github.event_name == 'release' }}
+
+            type=raw,value=nightly,enable=${{ github.ref == 'refs/heads/master' }}
+            type=sha,enable=${{ github.ref == 'refs/heads/master' }}
+
+            type=raw,value=unstable,enable=${{ github.ref == 'refs/heads/develop' }}
+            type=sha,enable=${{ github.ref == 'refs/heads/develop' }}
 
       - name: Build and push Docker image
         id: push
@@ -35,4 +49,4 @@ jobs:
           file: ./Dockerfile.build
           push: true
           tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/pkl.yml b/.github/workflows/pkl.yml
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -0,0 +1,50 @@
+name: Publish Artifacts
+on:
+  release:
+    types: [published]
+  push:
+    branches:
+      - develop
+      - master
+jobs:
+  Publish:
+    if: github.repository == 'CollaborativeStateMachines/Cirrina'
+    name: Publish Artifacts to GitHub
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup GraalVM
+        uses: graalvm/setup-graalvm@v1
+        with:
+          java-version: '21'
+          distribution: 'graalvm'
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Install Protoc
+        uses: arduino/setup-protoc@v3
+
+      - name: Build
+        run: ./gradlew build
+
+      - name: Build distribution ZIP
+        if: github.event_name == 'release'
+        run: ./gradlew distZip
+
+      - name: Upload unstable/nightly Pkl packages
+        if: github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/master'
+        uses: actions/upload-artifact@v4
+        with:
+          path: build/generated/pkl/packages/csm/*
+
+      - name: Upload release artifacts to GitHub Release
+        if: github.event_name == 'release'
+        uses: softprops/action-gh-release@v2
+        with:
+          files: |
+            build/generated/pkl/packages/csm/*
+            build/distributions/*.zip
+            ATTRIBUTIONS.md
+            LICENSE
+          token: ${{ secrets.GITHUB_TOKEN }}
+
diff --git a/.gitignore b/.gitignore
@@ -179,6 +179,8 @@ fabric.properties
 
 # End of https://www.toptal.com/developers/gitignore/api/intellij
 
+/bin
+
 # PlantUML
 *.puml
 
diff --git a/.idea/pklSettings.xml b/.idea/pklSettings.xml
diff --git a/Dockerfile.pkl b/Dockerfile.pkl
diff --git a/src/test/java/at/ac/uibk/dps/cirrina/runtime/offline/CompleteTest.java b/src/test/java/at/ac/uibk/dps/cirrina/runtime/offline/CompleteTest.java
@@ -117,8 +117,6 @@ public void unsubscribe(String source, String subject) {}
       var mockPersistentContext = new InMemoryContext(true) {
         @Override
         public int assign(String name, Object value) throws IOException {
-          System.out.println("Assigning " + name + " with value " + value);
-
           // Don't expect any variables assigned except for v
           assertTrue(name.equals("v"));
 
diff --git a/src/test/resources/pkl/complete/main.pkl b/src/test/resources/pkl/complete/main.pkl
@@ -1,5 +1,5 @@
-amends "package://localhost:10000/csm/csm@3.0.0#/Csml.pkl"
-import "package://localhost:10000/csm/csm@3.0.0#/Csml.pkl"
+amends "modulepath:/pkl/csm/Csml.pkl"
+import "modulepath:/pkl/csm/Csml.pkl"
 
 import "stateMachineOne.pkl"
 
diff --git a/src/test/resources/pkl/complete/stateMachineOne.pkl b/src/test/resources/pkl/complete/stateMachineOne.pkl
@@ -1,4 +1,4 @@
-import "package://localhost:10000/csm/csm@3.0.0#/Csml.pkl"
+import "modulepath:/pkl/csm/Csml.pkl"
 
 //                                           State Machine One                                           
 // ┌─────────────────────────────────────────────────────────────────────────────────────────────────────┐
diff --git a/src/test/resources/pkl/completeNested/main.pkl b/src/test/resources/pkl/completeNested/main.pkl
@@ -1,7 +1,7 @@
 // TODO: This test is incomplete
 
-amends "package://localhost:10000/csm/csm@3.0.0#/Csml.pkl"
-import "package://localhost:10000/csm/csm@3.0.0#/Csml.pkl"
+amends "modulepath:/pkl/csm/Csml.pkl"
+import "modulepath:/pkl/csm/Csml.pkl"
 
 name = "completeNested"
 version = "3.0.0"
diff --git a/src/test/resources/pkl/invoke/main.pkl b/src/test/resources/pkl/invoke/main.pkl
@@ -1,5 +1,5 @@
-amends "package://localhost:10000/csm/csm@3.0.0#/Csml.pkl"
-import "package://localhost:10000/csm/csm@3.0.0#/Csml.pkl"
+amends "modulepath:/pkl/csm/Csml.pkl"
+import "modulepath:/pkl/csm/Csml.pkl"
 
 name = "invoke"
 version = "3.0.0"
diff --git a/src/test/resources/pkl/pingPong/main.pkl b/src/test/resources/pkl/pingPong/main.pkl
@@ -1,5 +1,5 @@
-amends "package://localhost:10000/csm/csm@3.0.0#/Csml.pkl"
-import "package://localhost:10000/csm/csm@3.0.0#/Csml.pkl"
+amends "modulepath:/pkl/csm/Csml.pkl"
+import "modulepath:/pkl/csm/Csml.pkl"
 
 import "stateMachineOne.pkl"
 import "stateMachineTwo.pkl"
diff --git a/src/test/resources/pkl/pingPong/stateMachineOne.pkl b/src/test/resources/pkl/pingPong/stateMachineOne.pkl
@@ -1,4 +1,4 @@
-import "package://localhost:10000/csm/csm@3.0.0#/Csml.pkl"
+import "modulepath:/pkl/csm/Csml.pkl"
 
 //             State Machine One
 // ┌──────────────────────────────────────────┐
@@ -12,7 +12,7 @@ import "package://localhost:10000/csm/csm@3.0.0#/Csml.pkl"
 // │                 e4                       │
 // │                                          │
 // └──────────────────────────────────────────┘
-class StateMachine extends Csml.StateMachine {
+class StateMachine extends Csml.StateMachineDescription {
   name = "stateMachine1"
   states {
     new {
diff --git a/src/test/resources/pkl/pingPong/stateMachineTwo.pkl b/src/test/resources/pkl/pingPong/stateMachineTwo.pkl
@@ -1,4 +1,4 @@
-import "package://localhost:10000/csm/csm@3.0.0#/Csml.pkl"
+import "modulepath:/pkl/csm/Csml.pkl"
 
 //             State Machine Two
 // ┌──────────────────────────────────────────┐
@@ -12,7 +12,7 @@ import "package://localhost:10000/csm/csm@3.0.0#/Csml.pkl"
 // │                 e3                       │
 // │                                          │
 // └──────────────────────────────────────────┘
-class StateMachine extends Csml.StateMachine {
+class StateMachine extends Csml.StateMachineDescription {
   name = "stateMachine2"
   states {
     new {
diff --git a/src/test/resources/pkl/timeout/main.pkl b/src/test/resources/pkl/timeout/main.pkl
@@ -1,5 +1,5 @@
-amends "package://localhost:10000/csm/csm@3.0.0#/Csml.pkl"
-import "package://localhost:10000/csm/csm@3.0.0#/Csml.pkl"
+amends "modulepath:/pkl/csm/Csml.pkl"
+import "modulepath:/pkl/csm/Csml.pkl"
 
 name = "timeout"
 version = "3.0.0"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import "package://localhost:10000/csm/csm@3.0.0#/Csml.pkl"`
	`1`	`+import "modulepath:/pkl/csm/Csml.pkl"`
`2`	`2`
`3`	`3`	`// State Machine One`
`4`	`4`	`// ┌─────────────────────────────────────────────────────────────────────────────────────────────────────┐`