Skip to content

Commit

Permalink
configure jhipster bom in github-build-matrix
Browse files Browse the repository at this point in the history
  • Loading branch information
@mshima
mshima committed Oct 19, 2024
1 parent 520e206 commit 27b1b5a
Show file tree
Hide file tree
Showing 2 changed files with 128 additions and 31 deletions.
155 changes: 124 additions & 31 deletions .blueprint/github-build-matrix/__snapshots__/generator.spec.ts.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@ exports[`generator - github-build-matrix with angular should match matrix value
"app-sample": "ng-default",
"entity": "sqlfull",
"sonar-analyse": "true",
"workspaces": "false"
"workspaces": "false",
"build-jhipster-bom": true,
"jhipster-bom-branch": "main",
"jhipster-bom-cicd-version": "0.0.0-CICD"
},
{
"job-name": "ng-default-additional (n20.18.0/j17)",
Expand All @@ -35,7 +38,10 @@ exports[`generator - github-build-matrix with angular should match matrix value
"entity": "none",
"app-sample": "ng-default",
"jdl-entity": "*",
"workspaces": "false"
"workspaces": "false",
"build-jhipster-bom": true,
"jhipster-bom-branch": "main",
"jhipster-bom-cicd-version": "0.0.0-CICD"
},
{
"job-name": "ng-mysql-es-noi18n-mapsid (n20/j17)",
Expand All @@ -51,7 +57,10 @@ exports[`generator - github-build-matrix with angular should match matrix value
"name": "ng-mysql-es-noi18n-mapsid",
"app-sample": "ng-mysql-es-noi18n-mapsid",
"entity": "sql",
"workspaces": "false"
"workspaces": "false",
"build-jhipster-bom": true,
"jhipster-bom-branch": "main",
"jhipster-bom-cicd-version": "0.0.0-CICD"
},
{
"job-name": "ng-mongodb-kafka-cucumber (n20/j21)",
Expand All @@ -70,7 +79,10 @@ exports[`generator - github-build-matrix with angular should match matrix value
"generatorOptions": {
"defaultEnvironment": "dev"
},
"workspaces": "false"
"workspaces": "false",
"build-jhipster-bom": true,
"jhipster-bom-branch": "main",
"jhipster-bom-cicd-version": "0.0.0-CICD"
},
{
"job-name": "ng-h2mem-ws-nol2 (n20.18.0/j21)",
Expand All @@ -89,7 +101,10 @@ exports[`generator - github-build-matrix with angular should match matrix value
"generatorOptions": {
"defaultEnvironment": "dev"
},
"workspaces": "false"
"workspaces": "false",
"build-jhipster-bom": true,
"jhipster-bom-branch": "main",
"jhipster-bom-cicd-version": "0.0.0-CICD"
},
{
"job-name": "ng-gradle-fr (n20/j22)",
Expand All @@ -106,7 +121,10 @@ exports[`generator - github-build-matrix with angular should match matrix value
"name": "ng-gradle-fr",
"app-sample": "ng-gradle-fr",
"entity": "sql",
"workspaces": "false"
"workspaces": "false",
"build-jhipster-bom": true,
"jhipster-bom-branch": "main",
"jhipster-bom-cicd-version": "0.0.0-CICD"
},
{
"job-name": "ng-gradle-mariadb-oauth2-infinispan (n20/j22)",
Expand All @@ -126,7 +144,10 @@ exports[`generator - github-build-matrix with angular should match matrix value
"generatorOptions": {
"defaultEnvironment": "dev"
},
"workspaces": "false"
"workspaces": "false",
"build-jhipster-bom": true,
"jhipster-bom-branch": "main",
"jhipster-bom-cicd-version": "0.0.0-CICD"
},
{
"job-name": "ng-gradle-h2disk-ws-nocache (n20/j22)",
Expand All @@ -147,7 +168,10 @@ exports[`generator - github-build-matrix with angular should match matrix value
"defaultEnvironment": "dev",
"defaultPackaging": "war"
},
"workspaces": "false"
"workspaces": "false",
"build-jhipster-bom": true,
"jhipster-bom-branch": "main",
"jhipster-bom-cicd-version": "0.0.0-CICD"
},
{
"job-name": "ng-webflux-mongodb (n20/j21)",
Expand All @@ -163,7 +187,10 @@ exports[`generator - github-build-matrix with angular should match matrix value
"name": "ng-webflux-mongodb",
"app-sample": "webflux-mongodb",
"entity": "mongodb",
"workspaces": "false"
"workspaces": "false",
"build-jhipster-bom": true,
"jhipster-bom-branch": "main",
"jhipster-bom-cicd-version": "0.0.0-CICD"
},
{
"job-name": "ng-webflux-gradle-mongodb-oauth2 (n20/j21)",
Expand All @@ -180,7 +207,10 @@ exports[`generator - github-build-matrix with angular should match matrix value
"name": "ng-webflux-gradle-mongodb-oauth2",
"app-sample": "webflux-mongodb-oauth2",
"entity": "mongodb",
"workspaces": "false"
"workspaces": "false",
"build-jhipster-bom": true,
"jhipster-bom-branch": "main",
"jhipster-bom-cicd-version": "0.0.0-CICD"
},
{
"job-name": "ng-webflux-psql-default (n20/j22)",
Expand All @@ -196,7 +226,10 @@ exports[`generator - github-build-matrix with angular should match matrix value
"name": "ng-webflux-psql-default",
"app-sample": "webflux-psql",
"entity": "sql",
"workspaces": "false"
"workspaces": "false",
"build-jhipster-bom": true,
"jhipster-bom-branch": "main",
"jhipster-bom-cicd-version": "0.0.0-CICD"
},
{
"job-name": "ng-webflux-psql-additional (n20/j22)",
Expand All @@ -211,7 +244,10 @@ exports[`generator - github-build-matrix with angular should match matrix value
"skip-frontend-tests": "false",
"name": "ng-webflux-psql-additional",
"jdl-samples": "webflux-psql,custom-domain",
"workspaces": "false"
"workspaces": "false",
"build-jhipster-bom": true,
"jhipster-bom-branch": "main",
"jhipster-bom-cicd-version": "0.0.0-CICD"
},
{
"job-name": "ng-webflux-gradle-session-h2mem-es (n18/j17)",
Expand All @@ -231,7 +267,10 @@ exports[`generator - github-build-matrix with angular should match matrix value
"defaultEnvironment": "dev"
},
"entity": "sqllight",
"workspaces": "false"
"workspaces": "false",
"build-jhipster-bom": true,
"jhipster-bom-branch": "main",
"jhipster-bom-cicd-version": "0.0.0-CICD"
},
{
"job-name": "ms-ng-oauth2-mongodb-caffeine (n18/j17)",
Expand All @@ -252,7 +291,10 @@ exports[`generator - github-build-matrix with angular should match matrix value
"experimental": true,
"monorepository": true
},
"workspaces": "true"
"workspaces": "true",
"build-jhipster-bom": true,
"jhipster-bom-branch": "main",
"jhipster-bom-cicd-version": "0.0.0-CICD"
},
{
"job-name": "mf-ng-eureka-jwt-psql-ehcache (n20.18.0/j17)",
Expand All @@ -272,7 +314,10 @@ exports[`generator - github-build-matrix with angular should match matrix value
"workspaces": true,
"monorepository": true
},
"workspaces": "true"
"workspaces": "true",
"build-jhipster-bom": true,
"jhipster-bom-branch": "main",
"jhipster-bom-cicd-version": "0.0.0-CICD"
},
{
"job-name": "ms-mf-ng-consul-oauth2-neo4j (n20.18.0/j17)",
Expand All @@ -292,7 +337,10 @@ exports[`generator - github-build-matrix with angular should match matrix value
"workspaces": true,
"monorepository": true
},
"workspaces": "true"
"workspaces": "true",
"build-jhipster-bom": true,
"jhipster-bom-branch": "main",
"jhipster-bom-cicd-version": "0.0.0-CICD"
}
]
}"
Expand Down Expand Up @@ -531,7 +579,10 @@ exports[`generator - github-build-matrix with react should match matrix value 1`
"name": "react-default",
"app-sample": "react-default",
"entity": "sqlfull",
"workspaces": "false"
"workspaces": "false",
"build-jhipster-bom": true,
"jhipster-bom-branch": "main",
"jhipster-bom-cicd-version": "0.0.0-CICD"
},
{
"job-name": "react-maven-h2mem-memcached (n20/j17)",
Expand All @@ -550,7 +601,10 @@ exports[`generator - github-build-matrix with react should match matrix value 1`
"generatorOptions": {
"defaultEnvironment": "dev"
},
"workspaces": "false"
"workspaces": "false",
"build-jhipster-bom": true,
"jhipster-bom-branch": "main",
"jhipster-bom-cicd-version": "0.0.0-CICD"
},
{
"job-name": "react-gradle-mysql-es-noi18n-mapsid (n20.18.0/j22)",
Expand All @@ -567,7 +621,10 @@ exports[`generator - github-build-matrix with react should match matrix value 1`
"name": "react-gradle-mysql-es-noi18n-mapsid",
"app-sample": "react-gradle-mysql-es-noi18n-mapsid",
"entity": "sql",
"workspaces": "false"
"workspaces": "false",
"build-jhipster-bom": true,
"jhipster-bom-branch": "main",
"jhipster-bom-cicd-version": "0.0.0-CICD"
},
{
"job-name": "react-gradle-cassandra-session-redis (n20/j17)",
Expand All @@ -584,7 +641,10 @@ exports[`generator - github-build-matrix with react should match matrix value 1`
"name": "react-gradle-cassandra-session-redis",
"app-sample": "react-gradle-cassandra-session-redis",
"entity": "cassandra",
"workspaces": "false"
"workspaces": "false",
"build-jhipster-bom": true,
"jhipster-bom-branch": "main",
"jhipster-bom-cicd-version": "0.0.0-CICD"
},
{
"job-name": "ms-react-consul-jwt-cassandra-redis (n20/j17)",
Expand All @@ -604,7 +664,10 @@ exports[`generator - github-build-matrix with react should match matrix value 1`
"workspaces": true,
"monorepository": true
},
"workspaces": "true"
"workspaces": "true",
"build-jhipster-bom": true,
"jhipster-bom-branch": "main",
"jhipster-bom-cicd-version": "0.0.0-CICD"
},
{
"job-name": "ms-mf-react-eureka-oauth2-mariadb-infinispan (n18/j17)",
Expand All @@ -624,7 +687,10 @@ exports[`generator - github-build-matrix with react should match matrix value 1`
"workspaces": true,
"monorepository": true
},
"workspaces": "true"
"workspaces": "true",
"build-jhipster-bom": true,
"jhipster-bom-branch": "main",
"jhipster-bom-cicd-version": "0.0.0-CICD"
}
]
}"
Expand All @@ -647,7 +713,10 @@ exports[`generator - github-build-matrix with vue should match matrix value 1`]
"name": "vue-default",
"app-sample": "vue-default",
"entity": "sqlfull",
"workspaces": "false"
"workspaces": "false",
"build-jhipster-bom": true,
"jhipster-bom-branch": "main",
"jhipster-bom-cicd-version": "0.0.0-CICD"
},
{
"job-name": "vue-default-additional (n20/j21)",
Expand All @@ -664,7 +733,10 @@ exports[`generator - github-build-matrix with vue should match matrix value 1`]
"app-sample": "vue-default",
"entity": "none",
"jdl-entity": "custom-id",
"workspaces": "false"
"workspaces": "false",
"build-jhipster-bom": true,
"jhipster-bom-branch": "main",
"jhipster-bom-cicd-version": "0.0.0-CICD"
},
{
"job-name": "vue-noi18n-mysql-ws-oauth2 (n20/j21)",
Expand All @@ -680,7 +752,10 @@ exports[`generator - github-build-matrix with vue should match matrix value 1`]
"name": "vue-noi18n-mysql-ws-oauth2",
"app-sample": "vue-noi18n-ws-oauth2",
"entity": "sqlfull",
"workspaces": "false"
"workspaces": "false",
"build-jhipster-bom": true,
"jhipster-bom-branch": "main",
"jhipster-bom-cicd-version": "0.0.0-CICD"
},
{
"job-name": "vue-fulli18n-mysql-es (n20/j22)",
Expand All @@ -696,7 +771,10 @@ exports[`generator - github-build-matrix with vue should match matrix value 1`]
"name": "vue-fulli18n-mysql-es",
"app-sample": "vue-fulli18n-es",
"entity": "sql",
"workspaces": "false"
"workspaces": "false",
"build-jhipster-bom": true,
"jhipster-bom-branch": "main",
"jhipster-bom-cicd-version": "0.0.0-CICD"
},
{
"job-name": "vue-gradle-h2mem-ws-session (n20.18.0/j17)",
Expand All @@ -716,7 +794,10 @@ exports[`generator - github-build-matrix with vue should match matrix value 1`]
"generatorOptions": {
"defaultEnvironment": "dev"
},
"workspaces": "false"
"workspaces": "false",
"build-jhipster-bom": true,
"jhipster-bom-branch": "main",
"jhipster-bom-cicd-version": "0.0.0-CICD"
},
{
"job-name": "vue-h2disk-ws-theme (n20/j17)",
Expand All @@ -735,7 +816,10 @@ exports[`generator - github-build-matrix with vue should match matrix value 1`]
"generatorOptions": {
"defaultEnvironment": "dev"
},
"workspaces": "false"
"workspaces": "false",
"build-jhipster-bom": true,
"jhipster-bom-branch": "main",
"jhipster-bom-cicd-version": "0.0.0-CICD"
},
{
"job-name": "vue-session-cassandra-fr (n20.18.0/j17)",
Expand All @@ -754,7 +838,10 @@ exports[`generator - github-build-matrix with vue should match matrix value 1`]
"generatorOptions": {
"defaultEnvironment": "dev"
},
"workspaces": "false"
"workspaces": "false",
"build-jhipster-bom": true,
"jhipster-bom-branch": "main",
"jhipster-bom-cicd-version": "0.0.0-CICD"
},
{
"job-name": "ms-mf-vue-consul-oauth2-mysql-memcached (n20/j21)",
Expand All @@ -774,7 +861,10 @@ exports[`generator - github-build-matrix with vue should match matrix value 1`]
"workspaces": true,
"monorepository": true
},
"workspaces": "true"
"workspaces": "true",
"build-jhipster-bom": true,
"jhipster-bom-branch": "main",
"jhipster-bom-cicd-version": "0.0.0-CICD"
},
{
"job-name": "stack-vue-no-db (n18/j22)",
Expand All @@ -794,7 +884,10 @@ exports[`generator - github-build-matrix with vue should match matrix value 1`]
"workspaces": true,
"monorepository": true
},
"workspaces": "true"
"workspaces": "true",
"build-jhipster-bom": true,
"jhipster-bom-branch": "main",
"jhipster-bom-cicd-version": "0.0.0-CICD"
}
]
}"
Expand Down
4 changes: 4 additions & 0 deletions .blueprint/github-build-matrix/generator.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { join } from 'node:path';
import BaseGenerator from '../../generators/base/index.js';
import { getGithubOutputFile, setGithubTaskOutput } from '../../lib/testing/index.js';
import { getPackageRoot } from '../../lib/index.js';
import { BUILD_JHIPSTER_BOM, JHIPSTER_BOM_BRANCH, JHIPSTER_BOM_CICD_VERSION } from '../../test-integration/integration-test-constants.js';
import type { GitHubMatrix, GitHubMatrixRecord } from './support/github-ci-matrix.js';
import { convertToGitHubMatrix } from './support/github-ci-matrix.js';
import { dockerComposeMatrix } from './samples/docker-compose-integration.js';
Expand Down Expand Up @@ -90,6 +91,9 @@ export default class extends BaseGenerator {
...sample,
sample: jobName,
workspaces,
'build-jhipster-bom': BUILD_JHIPSTER_BOM,
'jhipster-bom-branch': BUILD_JHIPSTER_BOM ? JHIPSTER_BOM_BRANCH : undefined,
'jhipster-bom-cicd-version': BUILD_JHIPSTER_BOM ? JHIPSTER_BOM_CICD_VERSION : undefined,
},
];
}),
Expand Down

0 comments on commit 27b1b5a

Please sign in to comment.