From 457d7a45797988287acdd155500b99aa2014b79d Mon Sep 17 00:00:00 2001
From: Thomas Broyer <t.broyer@ltgt.net>
Date: Sun, 24 May 2020 20:03:57 +0200
Subject: [PATCH] Add output parameters for the tool path and version

This allows calling the action multiple times in the
same job and retrieving the path and/or version in
other steps.

Fixes #65
---
 .github/workflows/workflow.yml |  11 +++++++----
 __tests__/verify-java.ps1      |  20 ++++++++++++++++++++
 __tests__/verify-java.sh       |  24 ++++++++++++++++++++++--
 action.yml                     |   5 +++++
 dist/index.js                  | Bin 168248 -> 169053 bytes
 src/installer.ts               |   2 ++
 6 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index dda7306..1b7aa65 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -35,15 +35,16 @@ jobs:
       if: runner.os == 'windows'
       run: move "${{ runner.tool_cache }}" "${{ runner.tool_cache }}.old"
     - name: Setup Java 13
+      id: setup-java
       uses: ./
       with:
         java-version: 13.0.2
     - name: Verify Java 13
       if: runner.os != 'windows'
-      run: __tests__/verify-java.sh 13.0.2
+      run: __tests__/verify-java.sh 13.0.2 "${{ steps.setup-java.outputs.path }}" "${{ steps.setup-java.outputs.version }}"
     - name: Verify Java 13 (Windows)
       if: runner.os == 'windows'
-      run: __tests__/verify-java.ps1 13.0.2
+      run: __tests__/verify-java.ps1 13.0.2 "${{ steps.setup-java.outputs.path }}" "${{ steps.setup-java.outputs.version }}"
 
   test-proxy:
     runs-on: ubuntu-latest
@@ -62,11 +63,12 @@ jobs:
     - name: Clear tool cache
       run: rm -rf $RUNNER_TOOL_CACHE/*
     - name: Setup Java 13
+      id: setup-java
       uses: ./
       with:
         java-version: 13.0.2
     - name: Verify Java 13
-      run: __tests__/verify-java.sh 13.0.2
+      run: __tests__/verify-java.sh 13.0.2 "${{ steps.setup-java.outputs.path }}" "${{ steps.setup-java.outputs.version }}"
 
   test-bypass-proxy:
     runs-on: ubuntu-latest
@@ -78,8 +80,9 @@ jobs:
     - name: Clear tool cache
       run: rm -rf $RUNNER_TOOL_CACHE/*
     - name: Setup Java 13
+      id: setup-java
       uses: ./
       with:
         java-version: 13.0.2
     - name: Verify Java 13
-      run: __tests__/verify-java.sh 13.0.2
+      run: __tests__/verify-java.sh 13.0.2 "${{ steps.setup-java.outputs.path }}" "${{ steps.setup-java.outputs.version }}"
diff --git a/__tests__/verify-java.ps1 b/__tests__/verify-java.ps1
index 9f675c8..359f291 100644
--- a/__tests__/verify-java.ps1
+++ b/__tests__/verify-java.ps1
@@ -9,3 +9,23 @@ if (!$java_version.Contains($args[0]))
 {
   throw "Unexpected version"
 }
+
+if ($args.Count -lt 2 -or !$args[1])
+{
+  throw "Must supply java path argument"
+}
+
+if ($args[1] -ne $Env:JAVA_HOME)
+{
+  throw "Unexpected path"
+}
+
+if ($args.Count -lt 3 -or !$args[2])
+{
+  throw "Must supply java version argument"
+}
+
+if ($args[0] -ne $args[2])
+{
+  throw "Unexpected version"
+}
diff --git a/__tests__/verify-java.sh b/__tests__/verify-java.sh
index f34aba5..e0da7d3 100755
--- a/__tests__/verify-java.sh
+++ b/__tests__/verify-java.sh
@@ -1,13 +1,33 @@
 #!/bin/sh
 
 if [ -z "$1" ]; then
-  echo "Must supply java version argument"
+  echo "::error::Must supply java version argument"
   exit 1
 fi
 
 java_version="$(java -version 2>&1)"
 echo "Found java version: $java_version"
 if [ -z "$(echo $java_version | grep --fixed-strings $1)" ]; then
-  echo "Unexpected version"
+  echo "::error::Unexpected version"
+  exit 1
+fi
+
+if [ -z "$2" ]; then
+  echo "::error::Must supply java path argument"
+  exit 1
+fi
+
+if [ "$2" != "$JAVA_HOME" ]; then
+  echo "::error::Unexpected path"
+  exit 1
+fi
+
+if [ -z "$3" ]; then
+  echo "::error::Must supply java version argument"
+  exit 1
+fi
+
+if [ "$1" != "$3" ]; then
+  echo "::error::Unexpected version"
   exit 1
 fi
diff --git a/action.yml b/action.yml
index de7711f..d41f286 100644
--- a/action.yml
+++ b/action.yml
@@ -36,6 +36,11 @@ inputs:
   settings-path:
     description: 'Path to where the settings.xml file will be written. Default is ~/.m2.'
     required: false
+outputs:
+  path:
+    description: 'Path to where the java environment has been installed (same as $JAVA_HOME)'
+  version:
+    description: 'Actual version of the java environment that has been installed'
 runs:
   using: 'node12'
   main: 'dist/index.js'
diff --git a/dist/index.js b/dist/index.js
index 9663265367c82ea787bffe9122dd3970af3e1aad..263460632253c415a88c1012a6a5d2f9af433039 100644
GIT binary patch
delta 1329
zcmaJ>U1(fI6lNy7*>t;El5BR<xEq{J6Yj>O+eUm*j7^NzqD?nVQfw_tGVVRey=3>^
z+nL!-Q~D5%N*^09?SS~CFA5?S3b$|82SGuk6tPkxwUi=_AeIIpjS**m5}JU{%boL`
zbH4L4=iI9w1%LS@xNrq6-h67pwnwNnKL)3Zzy<Hjk^%C})6bSao!fQttsAJrTfB*8
zeEuL&N3Q&g;%`*0hlOy4Z5?=e47gonIT*1^p!e-ijss+b0c<Be0R_iql&LgylR-{Y
z3}j{*B~Vb#E~CAJJD6Ui`YTkx9G&0EH4dy~=HR$ROVrHMH}g;>`)V1rqo8+d8GRE&
zn*8`7O3KRt9Fw;mqVMIWtLS+t*HB~UK_U#3rzZ>a%oqq}0w=wszY@M&v^sKQ6|K0D
zLbJ>!@vcAtIHxn<HWgYcfIRsDYVq3sLJM_e%st@L%h7u%5U7^MD~7RuP>Z~`hF;#S
z<?S35rfq3i*?bAb<ZF-6ntOLHDp>?a<cW1e%96_V!mlVHFRi1LO8?7s^qG74K&!kk
ztB98VMpp;9O4cE?C=8pKXDgJ%0ICBc<}_io&Vo*aO(@aL>1kkK31Zk>ShN7{QZ(A{
zP{u*ue1_vJpWalH<iG%_svn2l2il&<w9QB=4~nZ6&m!`VCfw#uwfJ0zH+1dazo{xm
z;)F6FIm&^U76*%)!YqM%?0UPq(B;#rBxzwEvFCsdE3;G&8Bo!+ZN<4uuSeydgE$n^
zLB)nz1b(XOpLK`M#$0FaiE4|=eew=%pjE$5r-Hi42T>X7zzs56hoeo}ux$y|jD1JI
znh}QPy<LaDMm}!mX1x(V?!!BrJ`CU&s?f0?t32LD0N<~Z_oKK`{<a%G8QL~6^&#B5
z9qA9@-$PoF1KX#D#}b-MHR2lqgIanXn0x1ROty#dHThE*Cs2>K8pexgQ+U4#n|?W!
zM`14*!{dJW!xV0ox4Ut@)Z;j!R)$<edt~TybvrnW1K!0rzT42P9a0OS-k()>{W+4-
z)M#@-MUj`6R|#5=J2V{ezUac?m!wm~zSf-0Ak9H!ioz+1l;%)j$RPvA6OVx<V7xrR
zeWZ4C?<At$cLu%|@6!zRZ{U*-v(L<HS#s_iQP-T>nKW3XQ`+H)iP7=N(Xq^llWGBy
z*HK*Feh0VpRNVg8tL7wo-^Gu*HOu}_<D;3HsrTx8Sm2JWmq~LcZ>pO5w4N<YetRA#
NcWsH@%6WXW;a{`0zq$Yb

delta 816
zcmaKqOH5Ni6ozw#7O{}>C<UZIrWY-3C`~lFF^VCLgatw^EHI=t*LKp@mV3*cDUS%I
z#D)0SXcJE2(v2F4aY1s~$wot5sS9yY3>y=p#z+E2UeRkMN;GjclbQef=W+hCeBUyE
z*OHxsD@*$GC5V~2x`ask)hOe>GwKM72ADP^D@+loaWDO&1sPW}T7(sty+R*jy&}#u
zFJ8|>BR<SS11{#F8NcMgj{BFP30s%pfPQ)z7HdF4>l!$X2_6~hbQ!6~@EXj48*S@w
zqRvB4Q4vpYUwB9!3o@Z47^kiDFkW7V4|b|Co>mpkd_#<LImW2VMKN#(9QyoM$QHRQ
z^siy)zmAhrDRnf+q6v*fa#MaAak-Fh!a%8%QX{fRsEQQA${DD^Pn)oT8(VM`JGP<I
zc<J;u%z~72+MGE$V#3EeV8Zh|FsJ9g!>YO19hHUb!Ix%oq(btmiZDvo*3Fcdh)cSy
zm^_7IH&-J`kDlL0ykrmGh#m`R-`&WaeQnpX7P4A|lU73Uft9r4ij{mUlQNuXZN_gE
zA>mRvc~#<$%StrGwA{*YEk3It3(b+iq)({b>L}CvGG}g2h@PbCg^Pp9ke5b0UV3Q~
zr^-pS{-lz`!0{hkH)@kGgIAxeBeEGAn@ByOlZCi)Z`=3bhMkn^sV4HK#3gmgi4=<(
zsSIZr7sshvGP2@A78(Atp^Sy(k?__G9K`GvnDpB%<eNYDzQL-0PLc&jl@vExkB8Hm
zIyNqa=){BtJMKYs6;nnArLO+|Kwmfz>>W5~MB{t`4#caZwz6RQ$5Zj!vunX)(`56I
tq^NsPYTOhtI>%RldwO?Kz5f~!q}0dLsf2L1cw0R9?gnw{<u^%B$q#g28W;co

diff --git a/src/installer.ts b/src/installer.ts
index cce8fa3..487db6f 100644
--- a/src/installer.ts
+++ b/src/installer.ts
@@ -90,6 +90,8 @@ export async function getJava(
   core.exportVariable('JAVA_HOME', toolPath);
   core.exportVariable(extendedJavaHome, toolPath);
   core.addPath(path.join(toolPath, 'bin'));
+  core.setOutput('path', toolPath);
+  core.setOutput('version', version);
 }
 
 function getCacheVersionString(version: string) {