Merge pull request #25497 from mshima/blueprints-args

Pass arguments to blueprints
jhipster · Mar 15, 2024 · 349be3b · 349be3b
2 parents f4892e6 + 1393d90
commit 349be3b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/.github/actions/build-matrix/action.yml b/.github/actions/build-matrix/action.yml
@@ -53,8 +53,11 @@ inputs:
       }}
 outputs:
   matrix:
-    description: 'Build Matrix'
+    description: 'Build matrix'
     value: ${{ steps.build-matrix.outputs.matrix }}
+  empty-matrix:
+    description: 'Build matrix is empty'
+    value: ${{ steps.build-matrix.outputs.empty-matrix }}
   skip-workflow:
     description: 'Skip workflow'
     value: ${{ inputs.skip-workflow }}
@@ -135,5 +138,8 @@ runs:
         cat matrix.json >> $GITHUB_OUTPUT
         echo '' >> $GITHUB_OUTPUT
         echo 'EOF' >> $GITHUB_OUTPUT
+        EMPTY_MATRIX=$(cat matrix.json | jq '.include | length == 0')
+        echo "empty-matrix=${EMPTY_MATRIX}" >> $GITHUB_OUTPUT
+        cat $GITHUB_OUTPUT
         rm matrix.json
       shell: bash
diff --git a/.github/workflows/devserver.yml b/.github/workflows/devserver.yml
@@ -42,7 +42,7 @@ jobs:
     runs-on: ubuntu-20.04
     outputs:
       matrix: ${{ steps.build.outputs.matrix }}
-      client: ${{ steps.build.outputs.client }}
+      empty-matrix: ${{ steps.build.outputs.empty-matrix }}
     steps:
       - name: 'SETUP: Checkout generator-jhipster'
         uses: actions/checkout@v4
@@ -64,7 +64,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix: ${{fromJson(needs.build-matrix.outputs.matrix)}}
-    if: needs.build-matrix.outputs.client == 'true'
+    if: needs.build-matrix.outputs.empty-matrix != 'true'
     steps:
       #----------------------------------------------------------------------
       # Install all tools and check configuration

diff --git a/generators/base/generator.ts b/generators/base/generator.ts
@@ -584,6 +584,7 @@ export default class JHipsterBaseBlueprintGenerator<
     const finalOptions: ComposeOptions = {
       forwardOptions: true,
       schedule: generator => (generator as any).sbsBlueprint,
+      generatorArgs: this._args,
       ...extraOptions,
       generatorOptions: {
         jhipsterContext: this,

diff --git a/generators/languages/generator.js b/generators/languages/generator.js
@@ -68,9 +68,7 @@ export default class LanguagesGenerator extends BaseApplicationGenerator {
   async beforeQueue() {
     this.supportedLanguages = supportedLanguages;
     if (!this.fromBlueprint) {
-      this.composedBlueprints = await this.composeWithBlueprints('languages', {
-        generatorArgs: this.options.languages,
-      });
+      this.composedBlueprints = await this.composeWithBlueprints('languages');
     }
 
     if (!this.delegateToBlueprint) {