Merge tag '2024.1.0' into develop

2024.1.0
OpenEMS · Jan 1, 2024 · 5488bf2 · 5488bf2
2 parents 6ad51e4 + 29e0231
commit 5488bf2
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,6 +2,10 @@ name: Build OpenEMS
 on:
   pull_request:
     types: [opened, synchronize, reopened]
+  push:
+    branches:
+      - main
+      - develop
 
 jobs:
   build-java:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,11 +20,17 @@ jobs:
 
       - 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: Build all Java packages
+        run: ./gradlew build
 
-      - name: Clean Edge+Backend assets
-        run: ./gradlew cleanEdge cleanBackend
+      - name: Resolve OpenEMS bundles
+        run: ./gradlew resolve
+
+      - name: Validate BackendApp.bndrun
+        run: git diff --exit-code io.openems.backend.application/BackendApp.bndrun
+
+      - name: Validate EdgeApp.bndrun
+        run: git diff --exit-code io.openems.edge.application/EdgeApp.bndrun
 
       - name: Prepare Edge+Backend assets
         run: ./gradlew buildEdge buildBackend
@@ -63,6 +69,9 @@ jobs:
           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"
+          node_modules/.bin/ng lint
+          export CHROME_BIN=/usr/bin/google-chrome-stable
+          npm run test -- --no-watch --no-progress --browsers=ChromeHeadlessCI
 
       - name: Prepare UI asset
         run: |

diff --git a/io.openems.common/src/io/openems/common/OpenemsConstants.java b/io.openems.common/src/io/openems/common/OpenemsConstants.java
@@ -36,7 +36,7 @@ public class OpenemsConstants {
 	/**
 	 * The additional version string.
 	 */
-	public static final String VERSION_STRING = "SNAPSHOT";
+	public static final String VERSION_STRING = "";
 
 	/**
 	 * The complete version as a SemanticVersion.

diff --git a/ui/package-lock.json b/ui/package-lock.json
diff --git a/ui/package.json b/ui/package.json
@@ -1,6 +1,6 @@
 {
     "name": "openems-ui",
-    "version": "2024.1.0-SNAPSHOT",
+    "version": "2024.1.0",
     "license": "AGPL-3.0",
     "private": true,
     "dependencies": {

diff --git a/ui/src/app/changelog/view/component/changelog.constants.ts b/ui/src/app/changelog/view/component/changelog.constants.ts
@@ -2,7 +2,7 @@ import { Role } from "src/app/shared/type/role";
 
 export class Changelog {
 
-    public static readonly UI_VERSION = "2024.1.0-SNAPSHOT";
+    public static readonly UI_VERSION = "2024.1.0";
 
     public static product(...products: Product[]) {
         return products.map(product => Changelog.link(product.name, product.url)).join(", ") + '. ';