adjust git-changes

mshima · Oct 24, 2024 · 1d58644 · 1d58644
1 parent 3694014
commit 1d58644
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/.blueprint/github-build-matrix/generator.ts b/.blueprint/github-build-matrix/generator.ts
@@ -44,15 +44,15 @@ export default class extends BaseGenerator {
         // Push events requires a base commit for diff. Diff cannot be checked by @~1 if PR was merged with a rebase.
         const useChanges = this.eventName === 'pull_request';
         const changes = await getGitChanges({ allTrue: !useChanges });
-        const { base, common, devBlueprint, client, e2e, java, workspaces } = changes;
+        const { base, common, devBlueprint, client, e2e, graalvm, java, workspaces } = changes;
         const hasWorkflowChanges = changes[`${this.workflow}Workflow`];
 
         let matrix: GitHubMatrixRecord = {};
         let randomEnvironment = false;
         if (this.workflow === 'docker-compose-integration') {
           matrix = dockerComposeMatrix;
         } else if (this.workflow === 'graalvm') {
-          if (hasWorkflowChanges || java) {
+          if (hasWorkflowChanges || java || graalvm) {
             matrix = graalvmMatrix;
           }
         } else if (this.workflow === 'devserver') {

diff --git a/.blueprint/github-build-matrix/samples/graalvm.ts b/.blueprint/github-build-matrix/samples/graalvm.ts
@@ -16,7 +16,6 @@ export const graalvmMatrix = Object.fromEntries(
     key,
     {
       'java-version': '21',
-      'jdl-base': convertOptionsToJDL({ ...value, cacheProvider: 'no' }),
       jdl: convertOptionsToJDL({ ...value, graalvmSupport: true }),
     },
   ]),

diff --git a/.blueprint/github-build-matrix/support/git-changes.ts b/.blueprint/github-build-matrix/support/git-changes.ts
@@ -10,7 +10,8 @@ export const getGitChanges = async (options: { allTrue?: boolean } = {}) => {
     const git = simpleGit({ baseDir: fileURLToPath(new URL('../../', import.meta.url).href) });
     const summary = await git.diffSummary({ '@~1': null });
     const files = summary.files.map(({ file }) => file);
-    hasPatternChanges = (pattern: string) => files.some(file => minimatch(file, pattern, { dot: true }));
+    hasPatternChanges = (pattern: string, ignore?: string) =>
+      files.some(file => minimatch(file, pattern, { dot: true }) && (!ignore || !minimatch(file, ignore, { dot: true })));
   }
 
   const hasClientWorkflowChanges = (client: 'angular' | 'react' | 'vue') =>
@@ -29,7 +30,11 @@ export const getGitChanges = async (options: { allTrue?: boolean } = {}) => {
     common: hasPatternChanges('generators/{app,common,docker,languages}/**'),
     client: hasPatternChanges('generators/{client,init,javascript}/**'),
     e2e: hasPatternChanges('generators/cypress/**'),
-    java: hasPatternChanges('generators/{cucumber,feign-client,gatling,gradle,java,liquibase,maven,server,spring*}/**'),
+    java: hasPatternChanges(
+      'generators/{cucumber,feign-client,gatling,gradle,java,liquibase,maven,server,spring*}/**',
+      'generators/java/generators/graalvm/**',
+    ),
+    graalvm: hasPatternChanges('generators/java/generators/graalvm/**'),
     react: hasPatternChanges('generators/react/**'),
     reactWorkflow: hasClientWorkflowChanges('react'),
     workspaces: hasPatternChanges('generators/{docker-compose,kubernetes*,workspaces}/**'),