Skip to content

Commit b86b8a9

Browse files
committed
Compose with cicd in app generator
1 parent 29a48fc commit b86b8a9

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

generators/app/index.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/* eslint-disable consistent-return */
22
const chalk = require('chalk');
33
const AppGenerator = require('generator-jhipster/generators/app');
4+
const { GENERATOR_CI_CD } = require('generator-jhipster/generators/generator-list');
45
const packagejs = require('../../package.json');
56
const prompts = require('./prompts');
67

@@ -117,7 +118,12 @@ module.exports = class extends AppGenerator {
117118
}
118119

119120
get composing() {
120-
return super._composing();
121+
return {
122+
...super._composing(),
123+
async composeWithCiCd () {
124+
await this.composeWithJHipster(GENERATOR_CI_CD, true);
125+
}
126+
};
121127
}
122128

123129
get loading() {

generators/ci-cd/generator.mjs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ export default class extends CiCdGenerator {
3030

3131
const ciTypeChoices = [
3232
{ value: GITHUB , name: 'Github Action', },
33-
{ value: GITLAB, name: 'Gitlab CI', },
33+
{ value: GITLAB, name: 'Gitlab CI', },
34+
{ value: 'noci' , name: 'No CI', },
3435
];
3536

3637
const answers = await this.prompt([

0 commit comments

Comments
 (0)