generate sample adjusts

mshima · Jan 28, 2025 · 3df5bc2 · 3df5bc2
1 parent 997c9a6
commit 3df5bc2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.blueprint/generate-sample2/command.mjs b/.blueprint/generate-sample2/command.mjs
@@ -71,7 +71,6 @@ const command = {
             description: 'Sample name to generate',
             cli: {
                 type: String,
-                env: 'JHI_APP',
             },
             configure: gen => {
                 if (gen.appSample && gen.appSample !== 'jdl') {
@@ -87,11 +86,14 @@ const command = {
             description: 'Generate JDL samples',
             cli: {
                 type: String,
-                env: 'JHI_JDL_APP',
             },
             configure: gen => {
-                if (gen.jdlSamples) {
-                    const [app, ...entities] = gen.jdlSamples.split(',');
+                let { jdlSamples } = gen;
+                if (!jdlSamples && gen.appSample) {
+                    jdlSamples = workflowSamples[gen.appSample]?.['jdl-samples'];
+                }
+                if (jdlSamples) {
+                    const [app, ...entities] = jdlSamples.split(',');
                     gen.samplesFolder = `jdl-samples/${app}`;
                     gen.generatorArgs = '*.jdl';
                     if (entities && entities.length > 0) {
@@ -104,7 +106,6 @@ const command = {
         entityType: {
             description: 'Entity type to generate',
             cli: {
-                env: 'JHI_ENTITY',
                 type: String,
             },
             configure: gen => {
@@ -123,7 +124,6 @@ const command = {
             description: 'Generate JDL entities samples',
             cli: {
                 type: String,
-                env: 'JHI_JDL_ENTITY',
             },
             configure: gen => {
                 let { jdlEntities } = gen;

diff --git a/.github/workflows/angular.yml b/.github/workflows/angular.yml
@@ -113,7 +113,7 @@ jobs:
             #----------------------------------------------------------------------
             # Install JHipster and generate project+entities
             #----------------------------------------------------------------------
-            - run: cli.cjs generate-sample2 --skip-jhipster-dependencies --skip-install --skip-ktlint-format ${{ matrix.extra-args }} ${{ matrix.new-extra-args }}
+            - run: cli.cjs generate-sample2 --app-sample $JHI_APP --skip-jhipster-dependencies --skip-install --skip-ktlint-format ${{ matrix.extra-args }} ${{ matrix.new-extra-args }}
             - run: cli.cjs info
             #----------------------------------------------------------------------
             # Detect changes against base commit

diff --git a/.github/workflows/react.yml b/.github/workflows/react.yml
@@ -113,7 +113,7 @@ jobs:
             #----------------------------------------------------------------------
             # Install JHipster and generate project+entities
             #----------------------------------------------------------------------
-            - run: cli.cjs generate-sample2 --skip-jhipster-dependencies --skip-install --skip-ktlint-format ${{ matrix.extra-args }} ${{ matrix.new-extra-args }}
+            - run: cli.cjs generate-sample2 --app-sample $JHI_APP --skip-jhipster-dependencies --skip-install --skip-ktlint-format ${{ matrix.extra-args }} ${{ matrix.new-extra-args }}
             - run: cli.cjs info
             #----------------------------------------------------------------------
             # Detect changes against base commit