From 3543f3bfa8665a9023dde2e650b065740170ad02 Mon Sep 17 00:00:00 2001
From: Maxim Lobanov <v-malob@microsoft.com>
Date: Thu, 25 Mar 2021 12:48:35 +0300
Subject: [PATCH] remove debug info from tests

---
 .github/workflows/e2e-versions.yml  | 38 ++---------------------------
 README.md                           |  2 --
 dist/setup/index.js                 |  3 ---
 src/distributions/base-installer.ts |  2 --
 4 files changed, 2 insertions(+), 43 deletions(-)

diff --git a/.github/workflows/e2e-versions.yml b/.github/workflows/e2e-versions.yml
index 24b3c84e..b7832e57 100644
--- a/.github/workflows/e2e-versions.yml
+++ b/.github/workflows/e2e-versions.yml
@@ -33,15 +33,6 @@ jobs:
       - name: Verify Java
         run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java.outputs.path }}"
         shell: bash
-      - name: setup-java
-        uses: ./
-        id: setup-java2
-        with:
-          java-version: ${{ matrix.version }}
-          distribution: ${{ matrix.distribution }}
-      - name: Verify Java
-        run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java2.outputs.path }}"
-        shell: bash
 
   setup-java-major-minor-versions:
     name: ${{ matrix.distribution }} ${{ matrix.version }} (jdk-x64) - ${{ matrix.os }}
@@ -78,15 +69,6 @@ jobs:
       - name: Verify Java
         run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java.outputs.path }}"
         shell: bash
-      - name: setup-java
-        uses: ./
-        id: setup-java2
-        with:
-          java-version: ${{ matrix.version }}
-          distribution: ${{ matrix.distribution }}
-      - name: Verify Java
-        run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java2.outputs.path }}"
-        shell: bash
 
   setup-java-check-latest:
     name: ${{ matrix.distribution }} ${{ matrix.version }} - check-latest flag - ${{ matrix.os }}
@@ -113,6 +95,7 @@ jobs:
   
   setup-java-ea-versions-zulu:
     name: zulu ${{ matrix.version }} (jdk-x64) - ${{ matrix.os }}
+    needs: setup-java-major-minor-versions
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -131,18 +114,10 @@ jobs:
       - name: Verify Java
         run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java.outputs.path }}"
         shell: bash
-      - name: setup-java
-        uses: ./
-        id: setup-java2
-        with:
-          java-version: ${{ matrix.version }}
-          distribution: zulu
-      - name: Verify Java
-        run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java2.outputs.path }}"
-        shell: bash
 
   setup-java-ea-versions-adopt:
     name: adopt ${{ matrix.version }} (jdk-x64) - ${{ matrix.os }}
+    needs: setup-java-major-minor-versions
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -161,15 +136,6 @@ jobs:
       - name: Verify Java
         run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java.outputs.path }}"
         shell: bash
-      - name: setup-java
-        uses: ./
-        id: setup-java2
-        with:
-          java-version: ${{ matrix.version }}
-          distribution: adopt
-      - name: Verify Java
-        run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java2.outputs.path }}"
-        shell: bash
 
   setup-java-custom-package-type:
     name: ${{ matrix.distribution }} ${{ matrix.version }} (${{ matrix.java-package }}-x64) - ${{ matrix.os }}
diff --git a/README.md b/README.md
index b1942bc3..d7c90e5d 100644
--- a/README.md
+++ b/README.md
@@ -48,8 +48,6 @@ The `java-version` input supports an exact version or a version range using [Sem
 - more specific versions: `11.0`, `11.0.4`, `8.0.232`, `8.0.282+8`
 - early access (EA) versions: `15-ea`, `15.0.0-ea`, `15.0.0-ea.2`, `15.0.0+2-ea`
 
-**Note:** 4-digit notation will always force action to skip checking pre-cached versions and download version in runtime.
-
 #### Supported distributions
 Currently, the following distributions are supported:
 | Keyword | Distribution | Official site | License |
diff --git a/dist/setup/index.js b/dist/setup/index.js
index 2c37a5bf..fa160ea8 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -3970,7 +3970,6 @@ class JavaBase {
         this.checkLatest = installerOptions.checkLatest;
     }
     setupJava() {
-        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             let foundJava = this.findInToolcache();
             if (foundJava && !this.checkLatest) {
@@ -3980,8 +3979,6 @@ class JavaBase {
                 core.info('Trying to resolve the latest version from remote');
                 const javaRelease = yield this.findPackageForDownload(this.version);
                 core.info(`Resolved latest version as ${javaRelease.version}`);
-                core.info((_a = foundJava === null || foundJava === void 0 ? void 0 : foundJava.version) !== null && _a !== void 0 ? _a : '');
-                core.info((_b = javaRelease.version) !== null && _b !== void 0 ? _b : '');
                 if ((foundJava === null || foundJava === void 0 ? void 0 : foundJava.version) === javaRelease.version) {
                     core.info(`Resolved Java ${foundJava.version} from tool-cache`);
                 }
diff --git a/src/distributions/base-installer.ts b/src/distributions/base-installer.ts
index dd5b6df5..7db34943 100644
--- a/src/distributions/base-installer.ts
+++ b/src/distributions/base-installer.ts
@@ -41,8 +41,6 @@ export abstract class JavaBase {
       core.info('Trying to resolve the latest version from remote');
       const javaRelease = await this.findPackageForDownload(this.version);
       core.info(`Resolved latest version as ${javaRelease.version}`);
-      core.info(foundJava?.version ?? '');
-      core.info(javaRelease.version ?? '');
       if (foundJava?.version === javaRelease.version) {
         core.info(`Resolved Java ${foundJava.version} from tool-cache`);
       } else {