Merge pull request #2789 from statisticsnorway/develop

Develop to Master - Deploy to Prod

.github/workflows/testOnPr.yml

@@ -0,0 +1,30 @@
+# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs
+
+name: Build, Test and Lint
+
+on:
+  push:
+    branches: ['develop', 'main']
+  pull_request:
+    branches: ['develop', 'main']
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [20.x]
+        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: 'npm'
+      - run: npm ci
+      - run: npm run build --if-present
+      - run: npm run test
+      - run: npm run lint

build.gradle

@@ -14,7 +14,7 @@ app {
     systemVersion = "${xpVersion}"}
 
 dependencies {
-    include "com.enonic.lib:lib-thymeleaf:2.1.0"
+    include "com.enonic.lib:lib-thymeleaf:2.1.1"
     implementation "com.enonic.xp:core-api:${xpVersion}"
     implementation "com.enonic.xp:portal-api:${xpVersion}"
     include "com.enonic.xp:lib-content:${xpVersion}"
@@ -28,7 +28,7 @@ dependencies {
     include "com.enonic.xp:lib-i18n:${xpVersion}"
     include "com.enonic.lib:lib-cron:1.1.2"
     include "com.enonic.xp:lib-context:${xpVersion}"
-    include 'com.enonic.lib:lib-cache:2.2.0'
+    include 'com.enonic.lib:lib-cache:2.2.1'
     include "com.enonic.xp:lib-event:${xpVersion}"
     include "com.enonic.xp:lib-node:${xpVersion}"
     include "com.enonic.xp:lib-repo:${xpVersion}"

gradle.properties

@@ -1,6 +1,6 @@
 # Gradle Project settings
 projectName = mimir
-version = 2.9.0
+version = 2.9.1
 
 # XP App values
 appDisplayName = Mimir application