Merge pull request #24200 from mshima/skip_ci-matrix

test node 18/20 and java 17/21 matrix
jhipster · Nov 13, 2023 · 1681d07 · 1681d07
2 parents abaf365 + 3cf1a1b
commit 1681d07
Show file tree

Hide file tree

Showing 9 changed files with 64 additions and 32 deletions.
diff --git a/.github/workflows/angular.yml b/.github/workflows/angular.yml
@@ -58,7 +58,7 @@ jobs:
         with:
           workflow-samples-file: angular
   applications:
-    name: ${{ matrix.name }}
+    name: ${{ matrix.name }} (n${{ matrix.node }}/j${{ matrix.java }})
     runs-on: ${{ matrix.os || 'ubuntu-20.04' }}
     needs: build-matrix
     defaults:
@@ -102,11 +102,11 @@ jobs:
           application-packaging: ${{ matrix.setup-application-packaging }}
       - uses: actions/setup-node@v4
         with:
-          node-version: ${{ steps.setup.outputs.node-version }}
+          node-version: ${{ matrix.node }}
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: ${{ steps.setup.outputs.java-version }}
+          java-version: ${{ matrix.java }}
       - uses: jhipster/actions/restore-cache@v0
         with:
           npm: true

diff --git a/.github/workflows/react.yml b/.github/workflows/react.yml
@@ -58,7 +58,7 @@ jobs:
         with:
           workflow-samples-file: react
   applications:
-    name: ${{ matrix.name }}
+    name: ${{ matrix.name }} (n${{ matrix.node }}/j${{ matrix.java }})
     runs-on: ${{ matrix.os || 'ubuntu-20.04' }}
     needs: build-matrix
     defaults:
@@ -102,11 +102,11 @@ jobs:
           application-packaging: ${{ matrix.setup-application-packaging }}
       - uses: actions/setup-node@v4
         with:
-          node-version: ${{ steps.setup.outputs.node-version }}
+          node-version: ${{ matrix.node }}
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: ${{ steps.setup.outputs.java-version }}
+          java-version: ${{ matrix.java }}
       - uses: jhipster/actions/restore-cache@v0
         with:
           npm: true

diff --git a/.github/workflows/vue.yml b/.github/workflows/vue.yml
@@ -58,7 +58,7 @@ jobs:
         with:
           workflow-samples-file: vue
   applications:
-    name: ${{ matrix.name }}
+    name: ${{ matrix.name }} (n${{ matrix.node }}/j${{ matrix.java }})
     runs-on: ${{ matrix.os || 'ubuntu-20.04' }}
     needs: build-matrix
     defaults:
@@ -102,11 +102,11 @@ jobs:
           application-packaging: ${{ matrix.setup-application-packaging }}
       - uses: actions/setup-node@v4
         with:
-          node-version: ${{ steps.setup.outputs.node-version }}
+          node-version: ${{ matrix.node }}
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: ${{ steps.setup.outputs.java-version }}
+          java-version: ${{ matrix.java }}
       - uses: jhipster/actions/restore-cache@v0
         with:
           npm: true

diff --git a/generators/generator-constants.mts → generators/generator-constants.mjs b/generators/generator-constants.mts → generators/generator-constants.mjs
@@ -29,7 +29,10 @@ export const ADD_SPRING_MILESTONE_REPOSITORY = false;
 export const NODE_VERSION = '18.18.2';
 export const OPENAPI_GENERATOR_CLI_VERSION = '2.7.0';
 
-export const javaDependencies: Record<string, string> = {
+/**
+ * @type {Record<string, string>}
+ */
+export const javaDependencies = {
   /**
    * spring-boot version should match the one managed by https://mvnrepository.com/artifact/tech.jhipster/jhipster-dependencies/JHIPSTER_DEPENDENCIES_VERSION
    */
@@ -52,9 +55,10 @@ export const ELASTICSEARCH_TAG = '8.7.1';
 export const ELASTICSEARCH_IMAGE = 'docker.elastic.co/elasticsearch/elasticsearch';
 
 /**
+ * @type {Record<string, string>}
  * Manually updated docker containers
  */
-export const dockerContainers: Record<string, string> = {
+export const dockerContainers = {
   elasticsearchTag: ELASTICSEARCH_TAG,
   elasticsearchImage: ELASTICSEARCH_IMAGE,
   elasticsearch: `${ELASTICSEARCH_IMAGE}:${ELASTICSEARCH_TAG}`,

diff --git a/test-integration/scripts/00-init-env.sh b/test-integration/scripts/00-init-env.sh
@@ -79,7 +79,7 @@ fi
 
 # jdk version
 if [[ "$JHI_JDK" == "" ]]; then
-    JHI_JDK=$(grep -o "JAVA_VERSION = '[^']*'" $JHI_HOME/generators/generator-constants.mts | cut -f2 -d "'")
+    JHI_JDK=$(grep -o "JAVA_VERSION = '[^']*'" $JHI_HOME/generators/generator-constants.mjs | cut -f2 -d "'")
 fi
 
 # set correct OpenJDK version
@@ -92,7 +92,7 @@ if [[ "$JHI_CLI" == "" ]]; then
 fi
 
 # node version
-JHI_NODE_VERSION=$(grep -o "NODE_VERSION = '[^']*'" $JHI_HOME/generators/generator-constants.mts | cut -f2 -d "'")
+JHI_NODE_VERSION=$(grep -o "NODE_VERSION = '[^']*'" $JHI_HOME/generators/generator-constants.mjs | cut -f2 -d "'")
 
 # npm version
 JHI_NPM_VERSION=$(grep -o '"npm": "[^"]*"' $JHI_HOME/generators/common/resources/package.json | cut -f4 -d '"')

diff --git a/test-integration/scripts/99-write-matrix.js b/test-integration/scripts/99-write-matrix.js
@@ -2,6 +2,7 @@
 import { writeFileSync, readFileSync } from 'fs';
 import { dirname, join } from 'path';
 import { fileURLToPath } from 'url';
+import { JAVA_VERSION, NODE_VERSION } from '../../generators/generator-constants.mjs';
 
 const __filename = fileURLToPath(import.meta.url);
 const packageRoot = join(dirname(__filename), '../..');
@@ -39,6 +40,8 @@ writeFileSync(
                   'setup-entities-sample': sample.entity ?? 'none',
                   'setup-jdl-entities-sample': sample['jdl-entity'] ?? '',
                   'setup-jdl-sample': sample['jdl-samples'] ?? '',
+                  java: sample['java'] ?? JAVA_VERSION,
+                  node: sample['node'] ?? NODE_VERSION,
                 }));
             } catch (error) {
               console.log(`File ${file} not found`, error);

diff --git a/test-integration/workflow-samples/angular.json b/test-integration/workflow-samples/angular.json
@@ -10,18 +10,22 @@
       "name": "ng-default-additional",
       "entity": "none",
       "app-sample": "ng-default",
-      "jdl-entity": "*"
+      "jdl-entity": "*",
+      "node": "20",
+      "java": "21"
     },
     {
       "name": "ng-mysql-es-noi18n-mapsid",
       "app-sample": "ng-mysql-es-noi18n-mapsid",
-      "entity": "sql"
+      "entity": "sql",
+      "node": "20"
     },
     {
       "name": "ng-mongodb-kafka-cucumber",
       "app-sample": "ng-mongodb-kafka-cucumber",
       "entity": "mongodb",
-      "environment": "dev"
+      "environment": "dev",
+      "java": "21"
     },
     {
       "name": "ng-h2mem-ws-nol2",
@@ -44,21 +48,25 @@
     {
       "name": "ng-gradle-fr",
       "app-sample": "ng-gradle-fr",
-      "entity": "sql"
+      "entity": "sql",
+      "node": "20",
+      "java": "21"
     },
     {
       "name": "ng-gradle-mariadb-oauth2-infinispan",
       "app-sample": "ng-gradle-mariadb-oauth2-infinispan",
       "entity": "sql",
-      "environment": "dev"
+      "environment": "dev",
+      "node": "20"
     },
     {
       "name": "ng-gradle-h2disk-ws-nocache",
       "app-sample": "ng-gradle-h2disk-ws-nocache",
       "entity": "sql",
       "environment": "dev",
       "packaging": "war",
-      "testcontainers": "false"
+      "testcontainers": "false",
+      "java": "21"
     },
     {
       "name": "ng-webflux-mongodb",
@@ -70,7 +78,9 @@
       "name": "ng-webflux-gradle-mongodb-oauth2",
       "skip-backend-tests": "mongodb's reactive driver deadlocks with junit tests",
       "app-sample": "webflux-mongodb-oauth2",
-      "entity": "mongodb"
+      "entity": "mongodb",
+      "node": "20",
+      "java": "21"
     },
     {
       "name": "ng-webflux-psql-default",
@@ -79,19 +89,23 @@
     },
     {
       "name": "ng-webflux-psql-additional",
-      "jdl-samples": "webflux-psql,custom-domain"
+      "jdl-samples": "webflux-psql,custom-domain",
+      "node": "20",
+      "java": "21"
     },
     {
       "name": "ng-webflux-gradle-session-h2mem-es",
       "app-sample": "webflux-gradle-session-h2mem-es",
       "environment": "dev",
-      "entity": "sqllight"
+      "entity": "sqllight",
+      "node": "20"
     },
     {
       "name": "ng-webflux-couchbase",
       "disabled": "needs adjusts for sb3",
       "app-sample": "webflux-couchbase",
-      "entity": "couchbase"
+      "entity": "couchbase",
+      "java": "21"
     },
     {
       "name": "ms-ng-consul-oauth2-mongodb-caffeine",
@@ -103,13 +117,16 @@
       "name": "mf-ng-eureka-jwt-psql-ehcache",
       "jdl-samples": "mf-ng-eureka-jwt-psql-ehcache",
       "extra-args": "--workspaces --monorepository",
-      "workspaces": "true"
+      "workspaces": "true",
+      "node": "20",
+      "java": "21"
     },
     {
       "name": "ms-mf-ng-consul-oauth2-neo4j",
       "jdl-samples": "ms-mf-ng-consul-oauth2-neo4j",
       "extra-args": "--workspaces --monorepository",
-      "workspaces": "true"
+      "workspaces": "true",
+      "node": "20"
     }
   ]
 }
diff --git a/test-integration/workflow-samples/react.json b/test-integration/workflow-samples/react.json
@@ -9,24 +9,28 @@
       "name": "react-maven-h2mem-memcached",
       "app-sample": "react-maven-h2mem-memcached",
       "entity": "sql",
-      "environment": "dev"
+      "environment": "dev",
+      "node": "20",
+      "java": "21"
     },
     {
       "name": "react-gradle-mysql-es-noi18n-mapsid",
       "app-sample": "react-gradle-mysql-es-noi18n-mapsid",
       "entity": "sql",
-      "gradle": 1
+      "node": "20"
     },
     {
       "name": "react-gradle-cassandra-session-redis",
       "app-sample": "react-gradle-cassandra-session-redis",
-      "entity": "cassandra"
+      "entity": "cassandra",
+      "java": "21"
     },
     {
       "name": "ms-react-consul-jwt-cassandra-redis",
       "jdl-samples": "ms-react-consul-jwt-cassandra-redis",
       "extra-args": "--workspaces --monorepository",
-      "workspaces": "true"
+      "workspaces": "true",
+      "java": "21"
     },
     {
       "name": "ms-mf-react-eureka-oauth2-mariadb-infinispan",

diff --git a/test-integration/workflow-samples/vue.json b/test-integration/workflow-samples/vue.json
@@ -8,18 +8,22 @@
     {
       "name": "vue-noi18n-mysql-ws-oauth2",
       "app-sample": "vue-noi18n-ws-oauth2",
-      "entity": "sqlfull"
+      "entity": "sqlfull",
+      "node": "20",
+      "java": "21"
     },
     {
       "name": "vue-fulli18n-mysql-es",
       "app-sample": "vue-fulli18n-es",
-      "entity": "sql"
+      "entity": "sql",
+      "node": "20"
     },
     {
       "name": "vue-gradle-h2mem-ws-session",
       "app-sample": "vue-gradle-ws-session",
       "entity": "sql",
-      "environment": "dev"
+      "environment": "dev",
+      "java": "21"
     },
     {
       "name": "vue-h2disk-ws-theme",