UI: Test

.github/workflows/build.yml

@@ -66,22 +66,6 @@ jobs:
           name: jacoco_report
           path: jacoco/
 
-      #
-      # Is this a Tag? Prepare release assets
-      #
-      - name: Prepare Edge+Backend assets
-        if: startsWith(github.ref, 'refs/tags/')
-        run: ./gradlew buildEdge buildBackend
-
-      - name: Save build-artifacts
-        if: startsWith(github.ref, 'refs/tags/')
-        uses: actions/upload-artifact@v3
-        with:
-          name: build-artifacts
-          path: |
-            build/openems-edge.jar
-            build/openems-backend.jar
-
   build-ui:
     runs-on: ubuntu-latest
     steps:
@@ -110,44 +94,4 @@ jobs:
           node_modules/.bin/ng build -c "openems,openems-edge-prod,prod"
           node_modules/.bin/ng lint
           export CHROME_BIN=/usr/bin/google-chrome-stable
-          npm run test -- --no-watch --no-progress --browsers=ChromeHeadlessCI
-
-      #
-      # Is this a Tag? Prepare release assets
-      #
-      - name: Prepare UI asset
-        if: startsWith(github.ref, 'refs/tags/')
-        run: |
-          mkdir build
-          cd ui/target
-          zip -r ../../build/openems-ui.zip ./*
-
-      - name: Save build-artifacts
-        if: startsWith(github.ref, 'refs/tags/')
-        uses: actions/upload-artifact@v3
-        with:
-          name: build-artifacts
-          path: build/openems-ui.zip
-
-  #
-  # Is this a Tag? Create a draft release
-  #
-  release:
-    runs-on: ubuntu-latest
-    needs: [build-java, build-ui]
-    if: startsWith(github.ref, 'refs/tags/')
-    steps:
-      - name: Load build-artifacts
-        uses: actions/download-artifact@v3
-        with:
-          name: build-artifacts
-          path: build
-
-      - name: Create draft Release
-        uses: softprops/action-gh-release@v1
-        with:
-          draft: true
-          files: |
-            build/openems-edge.jar
-            build/openems-backend.jar
-            build/openems-ui.zip
+          npm run test -- --no-watch --no-progress --browsers=ChromeHeadlessCI

.github/workflows/release.yml

@@ -0,0 +1,96 @@
+name: Prepare OpenEMS Release
+
+on:
+  push:
+    tags:
+      - "*.*.*"
+
+jobs:
+  build-java:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup Java 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+          cache: gradle
+
+      - uses: kiancross/checkstyle-annotations-action@v1
+
+      - name: Validate BackendApp.bndrun and EdgeApp.bndrun
+        run: git diff --exit-code io.openems.backend.application/BackendApp.bndrun  io.openems.edge.application/EdgeApp.bndrun
+
+      - name: Clean Edge+Backend assets
+        run: ./gradlew cleanEdge cleanBackend
+
+      - name: Prepare Edge+Backend assets
+        run: ./gradlew buildEdge buildBackend
+
+      - name: Save build-artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: build-artifacts
+          path: |
+            build/openems-edge.jar
+            build/openems-backend.jar
+
+  build-ui:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '16'
+
+      - name: Setup Cache for Node.js
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.npm
+            ~/.ng
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: ${{ runner.os }}-node-
+
+      - name: Build OpenEMS UI
+        run: |
+          cd ui
+          npm install 
+          npm ci --prefer-offline --cache ~/.npm
+          node_modules/.bin/ng config cli.cache.path "~/.ng"
+          node_modules/.bin/ng build -c "openems,openems-edge-prod,prod"
+
+      - name: Prepare UI asset
+        run: |
+          mkdir build
+          cd ui/target
+          zip -r ../../build/openems-ui.zip ./*
+
+      - name: Save build-artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: build-artifacts
+          path: build/openems-ui.zip
+
+  release:
+    runs-on: ubuntu-latest
+    needs: [build-java, build-ui]
+    steps:
+      - name: Load build-artifacts
+        uses: actions/download-artifact@v3
+        with:
+          name: build-artifacts
+          path: build
+
+      - name: Create draft Release
+        uses: softprops/action-gh-release@v1
+        with:
+          draft: true
+          files: |
+            build/openems-edge.jar
+            build/openems-backend.jar
+            build/openems-ui.zip

.gitignore

@@ -118,6 +118,7 @@ local.properties
 *.zip
 *.tar.gz
 *.rar
+/*.deb
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
@@ -228,3 +229,6 @@ gradle-app.setting
 # OpenEMS temp files
 io.openems.edge.controller.api.mqtt/edge0
 io.openems.edge.application/c:/
+
+### Debian ###
+!tools/debian/**

.gradle-wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

build.gradle

@@ -247,42 +247,48 @@ task copyBundleReadmes() {
 		def targetBridge = basePath + "edge/bridge.adoc.d"
 		def targetDeviceService = basePath + "edge/device_service.adoc.d"
 		def targetTimedata = basePath + "edge/timedata.adoc.d"
-
+		def targetBackendService = basePath + "backend/service.adoc.d"
+
 		// initialize target files and directories
-		[targetController, targetScheduler, targetNature, targetBridge, targetDeviceService, targetTimedata].each { target ->
-			delete fileTree(dir: target, include: '**/*.adoc') 
+		[targetController, targetScheduler, targetNature, targetBridge, targetDeviceService, targetTimedata, targetBackendService].each { target ->
+			delete fileTree(dir: target, include: '**/*.adoc')
 			new File(target + "/_include.adoc").write('')
 		}
-	
+
 		subprojects.each { proj ->
 			// in each subproject (= bundle)...
 			proj.file(".").listFiles().each { sourceFile ->
 				// find the 'readme.adoc' file
 				if(sourceFile.getName().equalsIgnoreCase("readme.adoc")) {
 					def bundle = sourceFile.getParentFile().getName()
 					def target = null
-					// evaluate the OpenEMS Component ('Backend' or 'Edge')
+
 					if(bundle.startsWith("io.openems.edge.")) {
-					// evaluate the bundle type (e.g. 'Controller')
-					def edgeBundle = bundle.substring("io.openems.edge.".length())
-					if(edgeBundle.endsWith(".api")) {
-						target = targetNature
-					} else if(edgeBundle.startsWith("controller.")) {
-						target = targetController
-					} else if(edgeBundle.startsWith("scheduler.")) {
-						target = targetScheduler
-					} else if(edgeBundle.startsWith("bridge.")) {
-						target = targetBridge
-					} else if(edgeBundle.startsWith("timedata.")) {
-						target = targetTimedata
-					} else {
-						target = targetDeviceService
-					}
+						def edgeBundle = bundle.substring("io.openems.edge.".length())
+						if(edgeBundle.endsWith(".api")) {
+							target = targetNature
+						} else if(edgeBundle.startsWith("controller.")) {
+							target = targetController
+						} else if(edgeBundle.startsWith("scheduler.")) {
+							target = targetScheduler
+						} else if(edgeBundle.startsWith("bridge.")) {
+							target = targetBridge
+						} else if(edgeBundle.startsWith("timedata.")) {
+							target = targetTimedata
+						} else {
+							target = targetDeviceService
+						}
 
 					} else if(bundle.startsWith("io.openems.backend.")) {
-						// ignore
-						return
-
+						def backendBundle = bundle.substring("io.openems.backend.".length())
+						if(backendBundle.startsWith("timedata.")) {
+							target = targetBackendService
+						} else if(backendBundle.startsWith("metadata.")) {
+							target = targetBackendService
+						} else {
+							return // ignore
+						}
+
 					} else if(bundle.startsWith("io.openems.wrapper")) {
 						// ignore
 						return

cnf/build.bnd

@@ -40,7 +40,7 @@ buildpath: \
 	org.osgi.service.metatype;version='1.4.1',\
 	org.osgi.service.metatype.annotations;version='1.4.1',\
 	org.osgi.util.promise;version='1.2.0',\
-	com.google.guava;version='32.1.2.jre',\
+	com.google.guava;version='32.1.3.jre',\
 	com.google.gson;version='2.10.1',\
 
 testpath: \