minor changes

Author: dmitry-shibanov

.github/workflows/e2e-versions.yml

@@ -113,7 +113,7 @@ jobs:
           Get-ChildItem env:
           foreach ($version in $versionsArr)
           {
-            $envName = "JAVA_HOME_$version"
+            $envName = "JAVA_HOME_$version_${env:RUNNER_ARCH}"
             Write-Host "Check ${env:\$envName}"
             $JavaVersionPath = (Get-ChildItem env: | grep "$envName").Replace("$envName", "").Trim()
             if (-not (Test-Path "$JavaVersionPath")) { 

dist/setup/index.js

@@ -103210,7 +103210,7 @@ class JavaBase {
         core.setOutput('distribution', this.distribution);
         core.setOutput('path', toolPath);
         core.setOutput('version', version);
-        core.exportVariable(`JAVA_HOME_${majorVerssion}`, toolPath);
+        core.exportVariable(`JAVA_HOME_${majorVerssion}_${this.architecture.toUpperCase()}`, toolPath);
     }
 }
 exports.JavaBase = JavaBase;

src/distributions/base-installer.ts

@@ -148,6 +148,6 @@ export abstract class JavaBase {
     core.setOutput('distribution', this.distribution);
     core.setOutput('path', toolPath);
     core.setOutput('version', version);
-    core.exportVariable(`JAVA_HOME_${majorVerssion}`, toolPath);
+    core.exportVariable(`JAVA_HOME_${majorVerssion}_${this.architecture.toUpperCase()}`, toolPath);
   }
 }