Commit 55a7b0bd authored by benjaminParisel's avatar benjaminParisel
Browse files

Merge branch 'master' into dev

parents 68afeb78 ea998171
......@@ -25,10 +25,10 @@ jobs:
if [ ${{ github.event.action }} == 'github-publish' ]
then
echo "##[set-output name=tagVersion;]$(echo ${{ github.event.client_payload.releaseVersion }})"
echo "##[set-output name=studioBaseBranch;]$(echo ${{ github.event.client_payload.ref }})"
echo "##[set-output name=branchToRelease;]$(echo ${{ github.event.client_payload.ref }})"
else
echo "##[set-output name=tagVersion;]$(echo ${{ github.event.inputs.releaseVersion }})"
echo "##[set-output name=studioBaseBranch;]$(echo ${{ github.ref }})"
echo "##[set-output name=branchToRelease;]$(echo ${{ github.ref }})"
echo "##[set-output name=pushMavenCentral;]$(echo ${{ github.event.inputs.pushMavenCentral == 'true' }})"
fi
- uses: actions/checkout@v2
......@@ -36,14 +36,14 @@ jobs:
ref: ${{ steps.init.outputs.tagVersion }}
- name: Set up Java 11
if: ${{ steps.init.outputs.studioBaseBranch != 'refs/heads/master'}}
if: ${{ steps.init.outputs.branchToRelease == 'refs/heads/master' || steps.init.outputs.branchToRelease == 'refs/heads/dev'}}
uses: actions/setup-java@v1
with:
java-version: 11
# When repository-dispatch is called, default branch is always trigger, that's why we configure java 8 here for master branch
# When repository-dispatch is called, default branch is always trigger, that's why we configure java 8 here for 1.12.x branch
- name: Set up Java 8
if: ${{ steps.init.outputs.studioBaseBranch == 'refs/heads/master' && github.event.action == 'github-publish' }}
if: ${{ steps.init.outputs.branchToRelease == 'refs/heads/1.12.x' && github.event.action == 'github-publish' }}
uses: actions/setup-java@v1
with:
java-version: 8
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment