Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

testing: add github matrix utilities #27694

Merged
merged 2 commits into from
Oct 27, 2024
Merged

testing: add github matrix utilities #27694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d39a968
testing: add github matrix utilities
mshima Oct 27, 2024
b17bcc7
Update dev-server.ts
mshima Oct 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 34 additions & 17 deletions .blueprint/github-build-matrix/__snapshots__/generator.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,8 @@ exports[`generator - github-build-matrix with docker-compose-integration should
"jwt-secret-key": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=",
"cmd-e2e": "npm run ci:e2e:dev",
"args": "jdl",
"jdl": "application {\\n config {\\n testFrameworks [cypress]\\n databaseType cassandra\\n buildTool maven\\n authenticationType jwt\\n }\\n}"
"jdl": "application {\\n config {\\n testFrameworks [cypress]\\n databaseType cassandra\\n buildTool maven\\n authenticationType jwt\\n }\\n}",
"samples-group": "docker-compose-integration"
},
{
"job-name": "cassandra-reactive(true)-gradle-elasticsearch-oauth2-consul-kafka",
Expand All @@ -413,7 +414,8 @@ exports[`generator - github-build-matrix with docker-compose-integration should
"jwt-secret-key": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=",
"cmd-e2e": "npm run ci:e2e:dev",
"args": "jdl",
"jdl": "application {\\n config {\\n testFrameworks [cypress]\\n databaseType cassandra\\n reactive true\\n buildTool gradle\\n searchEngine elasticsearch\\n authenticationType oauth2\\n serviceDiscoveryType consul\\n messageBroker kafka\\n }\\n}"
"jdl": "application {\\n config {\\n testFrameworks [cypress]\\n databaseType cassandra\\n reactive true\\n buildTool gradle\\n searchEngine elasticsearch\\n authenticationType oauth2\\n serviceDiscoveryType consul\\n messageBroker kafka\\n }\\n}",
"samples-group": "docker-compose-integration"
},
{
"job-name": "mongodb-maven-jwt-kafka",
Expand All @@ -426,7 +428,8 @@ exports[`generator - github-build-matrix with docker-compose-integration should
"jwt-secret-key": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=",
"cmd-e2e": "npm run ci:e2e:dev",
"args": "jdl",
"jdl": "application {\\n config {\\n testFrameworks [cypress]\\n databaseType mongodb\\n buildTool maven\\n authenticationType jwt\\n messageBroker kafka\\n }\\n}"
"jdl": "application {\\n config {\\n testFrameworks [cypress]\\n databaseType mongodb\\n buildTool maven\\n authenticationType jwt\\n messageBroker kafka\\n }\\n}",
"samples-group": "docker-compose-integration"
},
{
"job-name": "mongodb-reactive(true)-gradle-elasticsearch-oauth2-consul",
Expand All @@ -439,7 +442,8 @@ exports[`generator - github-build-matrix with docker-compose-integration should
"jwt-secret-key": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=",
"cmd-e2e": "npm run ci:e2e:dev",
"args": "jdl",
"jdl": "application {\\n config {\\n testFrameworks [cypress]\\n databaseType mongodb\\n reactive true\\n buildTool gradle\\n searchEngine elasticsearch\\n authenticationType oauth2\\n serviceDiscoveryType consul\\n }\\n}"
"jdl": "application {\\n config {\\n testFrameworks [cypress]\\n databaseType mongodb\\n reactive true\\n buildTool gradle\\n searchEngine elasticsearch\\n authenticationType oauth2\\n serviceDiscoveryType consul\\n }\\n}",
"samples-group": "docker-compose-integration"
},
{
"job-name": "neo4j-maven-jwt-eureka",
Expand All @@ -452,7 +456,8 @@ exports[`generator - github-build-matrix with docker-compose-integration should
"jwt-secret-key": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=",
"cmd-e2e": "npm run ci:e2e:dev",
"args": "jdl",
"jdl": "application {\\n config {\\n testFrameworks [cypress]\\n databaseType neo4j\\n buildTool maven\\n authenticationType jwt\\n serviceDiscoveryType eureka\\n }\\n}"
"jdl": "application {\\n config {\\n testFrameworks [cypress]\\n databaseType neo4j\\n buildTool maven\\n authenticationType jwt\\n serviceDiscoveryType eureka\\n }\\n}",
"samples-group": "docker-compose-integration"
},
{
"job-name": "neo4j-reactive(true)-gradle-elasticsearch-oauth2-eureka-kafka",
Expand All @@ -465,7 +470,8 @@ exports[`generator - github-build-matrix with docker-compose-integration should
"jwt-secret-key": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=",
"cmd-e2e": "npm run ci:e2e:dev",
"args": "jdl",
"jdl": "application {\\n config {\\n testFrameworks [cypress]\\n databaseType neo4j\\n reactive true\\n buildTool gradle\\n searchEngine elasticsearch\\n authenticationType oauth2\\n serviceDiscoveryType eureka\\n messageBroker kafka\\n }\\n}"
"jdl": "application {\\n config {\\n testFrameworks [cypress]\\n databaseType neo4j\\n reactive true\\n buildTool gradle\\n searchEngine elasticsearch\\n authenticationType oauth2\\n serviceDiscoveryType eureka\\n messageBroker kafka\\n }\\n}",
"samples-group": "docker-compose-integration"
},
{
"job-name": "postgresql-cacheProvider(no)-maven-jwt-eureka-kafka",
Expand All @@ -478,7 +484,8 @@ exports[`generator - github-build-matrix with docker-compose-integration should
"jwt-secret-key": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=",
"cmd-e2e": "npm run ci:e2e:dev",
"args": "jdl",
"jdl": "application {\\n config {\\n testFrameworks [cypress]\\n prodDatabaseType postgresql\\n cacheProvider no\\n buildTool maven\\n authenticationType jwt\\n serviceDiscoveryType eureka\\n messageBroker kafka\\n }\\n}"
"jdl": "application {\\n config {\\n testFrameworks [cypress]\\n prodDatabaseType postgresql\\n cacheProvider no\\n buildTool maven\\n authenticationType jwt\\n serviceDiscoveryType eureka\\n messageBroker kafka\\n }\\n}",
"samples-group": "docker-compose-integration"
},
{
"job-name": "mysql-memcached-gradle-elasticsearch-oauth2-eureka",
Expand All @@ -491,7 +498,8 @@ exports[`generator - github-build-matrix with docker-compose-integration should
"jwt-secret-key": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=",
"cmd-e2e": "npm run ci:e2e:dev",
"args": "jdl",
"jdl": "application {\\n config {\\n testFrameworks [cypress]\\n prodDatabaseType mysql\\n cacheProvider memcached\\n buildTool gradle\\n searchEngine elasticsearch\\n authenticationType oauth2\\n serviceDiscoveryType eureka\\n }\\n}"
"jdl": "application {\\n config {\\n testFrameworks [cypress]\\n prodDatabaseType mysql\\n cacheProvider memcached\\n buildTool gradle\\n searchEngine elasticsearch\\n authenticationType oauth2\\n serviceDiscoveryType eureka\\n }\\n}",
"samples-group": "docker-compose-integration"
},
{
"job-name": "mariadb-redis-maven-jwt-consul",
Expand All @@ -504,7 +512,8 @@ exports[`generator - github-build-matrix with docker-compose-integration should
"jwt-secret-key": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=",
"cmd-e2e": "npm run ci:e2e:dev",
"args": "jdl",
"jdl": "application {\\n config {\\n testFrameworks [cypress]\\n prodDatabaseType mariadb\\n cacheProvider redis\\n buildTool maven\\n authenticationType jwt\\n serviceDiscoveryType consul\\n }\\n}"
"jdl": "application {\\n config {\\n testFrameworks [cypress]\\n prodDatabaseType mariadb\\n cacheProvider redis\\n buildTool maven\\n authenticationType jwt\\n serviceDiscoveryType consul\\n }\\n}",
"samples-group": "docker-compose-integration"
},
{
"job-name": "postgresql-reactive(true)-gradle-elasticsearch-oauth2-kafka",
Expand All @@ -517,7 +526,8 @@ exports[`generator - github-build-matrix with docker-compose-integration should
"jwt-secret-key": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=",
"cmd-e2e": "npm run ci:e2e:dev",
"args": "jdl",
"jdl": "application {\\n config {\\n testFrameworks [cypress]\\n prodDatabaseType postgresql\\n reactive true\\n buildTool gradle\\n searchEngine elasticsearch\\n authenticationType oauth2\\n messageBroker kafka\\n }\\n}"
"jdl": "application {\\n config {\\n testFrameworks [cypress]\\n prodDatabaseType postgresql\\n reactive true\\n buildTool gradle\\n searchEngine elasticsearch\\n authenticationType oauth2\\n messageBroker kafka\\n }\\n}",
"samples-group": "docker-compose-integration"
},
{
"job-name": "mysql-reactive(true)-maven-jwt-consul-kafka",
Expand All @@ -530,7 +540,8 @@ exports[`generator - github-build-matrix with docker-compose-integration should
"jwt-secret-key": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=",
"cmd-e2e": "npm run ci:e2e:dev",
"args": "jdl",
"jdl": "application {\\n config {\\n testFrameworks [cypress]\\n prodDatabaseType mysql\\n reactive true\\n buildTool maven\\n authenticationType jwt\\n serviceDiscoveryType consul\\n messageBroker kafka\\n }\\n}"
"jdl": "application {\\n config {\\n testFrameworks [cypress]\\n prodDatabaseType mysql\\n reactive true\\n buildTool maven\\n authenticationType jwt\\n serviceDiscoveryType consul\\n messageBroker kafka\\n }\\n}",
"samples-group": "docker-compose-integration"
},
{
"job-name": "mariadb-reactive(true)-gradle-elasticsearch-oauth2",
Expand All @@ -543,7 +554,8 @@ exports[`generator - github-build-matrix with docker-compose-integration should
"jwt-secret-key": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=",
"cmd-e2e": "npm run ci:e2e:dev",
"args": "jdl",
"jdl": "application {\\n config {\\n testFrameworks [cypress]\\n prodDatabaseType mariadb\\n reactive true\\n buildTool gradle\\n searchEngine elasticsearch\\n authenticationType oauth2\\n }\\n}"
"jdl": "application {\\n config {\\n testFrameworks [cypress]\\n prodDatabaseType mariadb\\n reactive true\\n buildTool gradle\\n searchEngine elasticsearch\\n authenticationType oauth2\\n }\\n}",
"samples-group": "docker-compose-integration"
},
{
"job-name": "h2",
Expand All @@ -556,7 +568,8 @@ exports[`generator - github-build-matrix with docker-compose-integration should
"jwt-secret-key": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=",
"cmd-e2e": "npm run ci:e2e:dev",
"args": "jdl",
"jdl": "application {\\n config {\\n testFrameworks [cypress]\\n devDatabaseType h2Disk\\n }\\n}"
"jdl": "application {\\n config {\\n testFrameworks [cypress]\\n devDatabaseType h2Disk\\n }\\n}",
"samples-group": "docker-compose-integration"
}
]
}"
Expand All @@ -574,7 +587,8 @@ exports[`generator - github-build-matrix with graalvm should match matrix value
"npm-version": "NPM-VERSION",
"default-environment": "prod",
"jwt-secret-key": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=",
"jdl": "application {\\n config {\\n testFrameworks [cypress]\\n buildTool maven\\n graalvmSupport true\\n }\\n}"
"jdl": "application {\\n config {\\n testFrameworks [cypress]\\n buildTool maven\\n graalvmSupport true\\n }\\n}",
"samples-group": "graalvm"
},
{
"job-name": "maven-reactive(true)",
Expand All @@ -585,7 +599,8 @@ exports[`generator - github-build-matrix with graalvm should match matrix value
"npm-version": "NPM-VERSION",
"default-environment": "prod",
"jwt-secret-key": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=",
"jdl": "application {\\n config {\\n testFrameworks [cypress]\\n buildTool maven\\n reactive true\\n graalvmSupport true\\n }\\n}"
"jdl": "application {\\n config {\\n testFrameworks [cypress]\\n buildTool maven\\n reactive true\\n graalvmSupport true\\n }\\n}",
"samples-group": "graalvm"
},
{
"job-name": "gradle",
Expand All @@ -596,7 +611,8 @@ exports[`generator - github-build-matrix with graalvm should match matrix value
"npm-version": "NPM-VERSION",
"default-environment": "prod",
"jwt-secret-key": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=",
"jdl": "application {\\n config {\\n testFrameworks [cypress]\\n buildTool gradle\\n graalvmSupport true\\n }\\n}"
"jdl": "application {\\n config {\\n testFrameworks [cypress]\\n buildTool gradle\\n graalvmSupport true\\n }\\n}",
"samples-group": "graalvm"
},
{
"job-name": "gradle-reactive(true)",
Expand All @@ -607,7 +623,8 @@ exports[`generator - github-build-matrix with graalvm should match matrix value
"npm-version": "NPM-VERSION",
"default-environment": "prod",
"jwt-secret-key": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=",
"jdl": "application {\\n config {\\n testFrameworks [cypress]\\n buildTool gradle\\n reactive true\\n graalvmSupport true\\n }\\n}"
"jdl": "application {\\n config {\\n testFrameworks [cypress]\\n buildTool gradle\\n reactive true\\n graalvmSupport true\\n }\\n}",
"samples-group": "graalvm"
}
]
}"
Expand Down
3 changes: 2 additions & 1 deletion .blueprint/github-build-matrix/generator.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { before, describe, expect, it } from 'esmocha';
import { defaultHelpers as helpers, runResult } from '../../lib/testing/index.js';
import { shouldSupportFeatures } from '../../test/support/index.js';
import Generator from './generator.js';
import { workflowChoices } from './command.js';

const __filename = fileURLToPath(import.meta.url);
const __dirname = dirname(__filename);
Expand All @@ -13,7 +14,7 @@ const generator = basename(__dirname);
describe(`generator - ${generator}`, () => {
shouldSupportFeatures(Generator);

for (const workflow of ['angular', 'devserver', 'graalvm', 'react', 'docker-compose-integration', 'vue']) {
for (const workflow of workflowChoices) {
describe(`with ${workflow}`, () => {
before(async () => {
await helpers.runJHipster(join(__dirname, 'index.ts'), { useEnvironmentBuilder: true }).withArguments(workflow);
Expand Down
21 changes: 13 additions & 8 deletions .blueprint/github-build-matrix/generator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
import { readFile } from 'node:fs/promises';
import { join } from 'node:path';
import BaseGenerator from '../../generators/base/index.js';
import { getGithubOutputFile, setGithubTaskOutput } from '../../lib/testing/index.js';
import type { GitHubMatrix, GitHubMatrixGroup } from '../../lib/testing/index.js';
import { convertToGitHubMatrix, getGithubOutputFile, getGithubSamplesGroup, 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';
import { getGitChanges } from './support/git-changes.js';
import { devServerMatrix } from './samples/dev-server.js';
import type { eventNameChoices, workflowChoices } from './command.js';
import { graalvmMatrix } from './samples/graalvm.js';

type JHipsterGitHubMatrix = GitHubMatrix & {
name: string;
Expand Down Expand Up @@ -47,13 +44,21 @@ export default class extends BaseGenerator {
const { base, common, devBlueprint, client, e2e, graalvm, java, workspaces } = changes;
const hasWorkflowChanges = changes[`${this.workflow}Workflow`];

let matrix: GitHubMatrixRecord = {};
let matrix: GitHubMatrixGroup = {};
let randomEnvironment = false;
if (this.workflow === 'docker-compose-integration') {
matrix = dockerComposeMatrix;
const { samples, warnings } = await getGithubSamplesGroup(this.templatePath('../samples/'), this.workflow);
matrix = samples;
if (warnings.length) {
this.log.warn(warnings.join('\n'));
}
} else if (this.workflow === 'graalvm') {
if (hasWorkflowChanges || java || graalvm) {
matrix = graalvmMatrix;
const { samples, warnings } = await getGithubSamplesGroup(this.templatePath('../samples/'), this.workflow);
matrix = samples;
if (warnings.length) {
this.log.warn(warnings.join('\n'));
}
}
} else if (this.workflow === 'devserver') {
if (devBlueprint || hasWorkflowChanges || client) {
Expand Down
4 changes: 3 additions & 1 deletion .blueprint/github-build-matrix/samples/dev-server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import type { GitHubMatrixGroup } from '../../../lib/testing/index.js';

export const devServerMatrix = {
angular: {
'ng-default': {
Expand All @@ -17,4 +19,4 @@ export const devServerMatrix = {
args: '--sample-yorc-folder --entities-sample sqllight',
},
},
};
} satisfies Record<string, GitHubMatrixGroup>;
5 changes: 3 additions & 2 deletions .blueprint/github-build-matrix/samples/docker-compose-integration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import type { GitHubMatrixGroup } from '../../../lib/testing/index.js';
import { extendMatrix, fromMatrix } from '../../../lib/testing/index.js';
import { convertOptionsToJDL } from '../support/jdl.js';

// Supported containers: https://github.com/spring-projects/spring-boot/tree/main/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection
export const dockerComposeMatrix = Object.fromEntries(
export default Object.fromEntries(
[
...Object.entries(
extendMatrix(
Expand Down Expand Up @@ -41,4 +42,4 @@ export const dockerComposeMatrix = Object.fromEntries(
jdl: convertOptionsToJDL(value),
},
]),
);
) satisfies GitHubMatrixGroup;
5 changes: 3 additions & 2 deletions .blueprint/github-build-matrix/samples/graalvm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import type { GitHubMatrixGroup } from '../../../lib/testing/index.js';
import { extendMatrix, fromMatrix } from '../../../lib/testing/index.js';
import { convertOptionsToJDL } from '../support/jdl.js';

export const graalvmMatrix = Object.fromEntries(
export default Object.fromEntries(
[
...Object.entries(
extendMatrix(
Expand All @@ -19,4 +20,4 @@ export const graalvmMatrix = Object.fromEntries(
jdl: convertOptionsToJDL({ ...value, graalvmSupport: true }),
},
]),
);
) satisfies GitHubMatrixGroup;
Loading
Loading