Merge pull request #70 from sophia-guo/PR

Remove check if openjdk-tests/openjdk-tests directory available
adoptium · Feb 17, 2021 · 23b3c70 · 23b3c70
2 parents fe08570 + 8ac4df1
commit 23b3c70
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -3381,10 +3381,7 @@ function runaqaTest(version, jdksource, buildList, target, customTarget, openjdk
         process.env.BUILD_LIST = buildList;
         if (!('TEST_JDK_HOME' in process.env))
             process.env.TEST_JDK_HOME = getTestJdkHome(version, jdksource);
-        const workspace = process.env['GITHUB_WORKSPACE'] || '';
-        if (!(workspace.includes('/openjdk-tests/openjdk-tests') || workspace.includes('\openjdk-tests\openjdk-tests'))) {
-            yield getOpenjdkTestRepo(openjdktestRepo);
-        }
+        yield getOpenjdkTestRepo(openjdktestRepo);
         yield runGetSh(tkgRepo);
         const options = {};
         let myOutput = '';

diff --git a/src/runaqa.ts b/src/runaqa.ts
@@ -37,11 +37,8 @@ export async function runaqaTest(
   setSpec()
   process.env.BUILD_LIST = buildList
   if (!('TEST_JDK_HOME' in process.env)) process.env.TEST_JDK_HOME = getTestJdkHome(version, jdksource)
-  const workspace = process.env['GITHUB_WORKSPACE'] || ''
-  if (!(workspace.includes('/openjdk-tests/openjdk-tests') || workspace.includes('\openjdk-tests\openjdk-tests'))) {
-    await getOpenjdkTestRepo(openjdktestRepo)
-  }
 
+  await getOpenjdkTestRepo(openjdktestRepo)
   await runGetSh(tkgRepo)
 
   const options: ExecOptions = {}