Merge pull request #33 from sophia-guo/subDir

Enable subdir run-aqa
adoptium · Oct 14, 2020 · 7d8787b · 7d8787b
2 parents 535d6f6 + a81e626
commit 7d8787b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -2900,11 +2900,11 @@ function run() {
                 core.error(`jdksource should be one of [upstream, github-hosted, install-jdk]. Found: ${jdksource}`);
             }
             if (buildList !== 'openjdk' &&
-                buildList !== 'external' &&
-                buildList !== 'functional' &&
-                buildList !== 'perf' &&
-                buildList !== 'system') {
-                core.setFailed(`buildList should be one of [openjdk, external, functional, system, perf]. Found: ${buildList}`);
+                !buildList.startsWith('external') &&
+                !buildList.startsWith('functional') &&
+                !buildList.startsWith('perf') &&
+                !buildList.startsWith('system')) {
+                core.setFailed(`buildList should be one of or sub dir of [openjdk, external, functional, system, perf]. Found: ${buildList}`);
             }
             if (jdksource !== 'upstream' && version.length === 0) {
                 core.setFailed('Please provide jdkversion if jdksource is github-hosted installed or AdoptOpenJKD/install-jdk installed.');

diff --git a/src/aqa.ts b/src/aqa.ts
@@ -24,13 +24,13 @@ async function run(): Promise<void> {
 
     if (
       buildList !== 'openjdk' &&
-      buildList !== 'external' &&
-      buildList !== 'functional' &&
-      buildList !== 'perf' &&
-      buildList !== 'system'
+      !buildList.startsWith('external') &&
+      !buildList.startsWith('functional') &&
+      !buildList.startsWith('perf') &&
+      !buildList.startsWith('system')
     ) {
       core.setFailed(
-        `buildList should be one of [openjdk, external, functional, system, perf]. Found: ${buildList}`
+        `buildList should be one of or sub dir of [openjdk, external, functional, system, perf]. Found: ${buildList}`
       )
     }
     if (jdksource !== 'upstream' && version.length === 0) {