ci: Fix publish-release not respecting all includes

TwelveIterationMods · Dec 3, 2024 · 989006e · 989006e
1 parent 9a080e3
commit 989006e
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -58,8 +58,8 @@ jobs:
           script: |
             const fs = require('fs');
             const settingsGradle = fs.readFileSync('settings.gradle', 'utf8');
-            const includePattern = /^(?!\s*\/\/)\s*include\s*\(\s*["']([^"']+)["']\s*\)/gm;
-            const includes = [...settingsGradle.matchAll(includePattern)].map(match => match[1]);
+            const includePattern = /^(?!\s*\/\/)\s*include\s*\(\s*(['"]([^'"]+)['"](?:,\s*['"]([^'"]+)['"])*\s*)\)/gm;
+            const includes = [...settingsGradle.matchAll(includePattern)].flatMap(match => match[0].match(/['"]([^'"]+)['"]/g).map(item => item.replace(/['"]/g, '')));
             const includeFabric = includes.includes('fabric') && ${{inputs.fabric}};
             const includeForge = includes.includes('forge') && ${{inputs.forge}};
             const includeNeoForge = includes.includes('neoforge') && ${{inputs.neoforge}};
@@ -73,8 +73,8 @@ jobs:
           script: |
             const fs = require('fs');
             const settingsGradle = fs.readFileSync('settings.gradle', 'utf8');
-            const includePattern = /^(?!\s*\/\/)\s*include\s*\(\s*["']([^"']+)["']\s*\)/gm;
-            const includes = [...settingsGradle.matchAll(includePattern)].map(match => match[1]);
+            const includePattern = /^(?!\s*\/\/)\s*include\s*\(\s*(['"]([^'"]+)['"](?:,\s*['"]([^'"]+)['"])*\s*)\)/gm;
+            const includes = [...settingsGradle.matchAll(includePattern)].flatMap(match => match[0].match(/['"]([^'"]+)['"]/g).map(item => item.replace(/['"]/g, '')));
             const includeFabric = includes.includes('fabric') && ${{inputs.fabric}};
             const includeForge = includes.includes('forge') && ${{inputs.forge}};
             const includeNeoForge = includes.includes('neoforge') && ${{inputs.neoforge}};