From 227178d27092c9dce3c588e8dd17d011646890e1 Mon Sep 17 00:00:00 2001 From: Guillaume Galy Date: Fri, 17 Dec 2021 15:43:29 +0100 Subject: [PATCH] chore: Switch GitHub actions from setup-scala to setup-java Motivation: See olafurpg/setup-scala#49: - olafurpg/setup-scala is no longer considered necessary by its maintainer and will probably be archived at some point. - Ubuntu runners now include the official SBT launcher by default. - actions/setup-java is the official action for setting up a JDK, so we might as well use that if it"s sufficient for our purpose. Modifications: - Replace olafurpg/setup-scala with actions/setup-java. - Use Zulu JDK. --- .github/workflows/build.yml | 7 ++++--- .github/workflows/create-release.yml | 7 ++++--- .github/workflows/release.yml | 7 ++++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f3cb31a..36e3b84 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,10 +31,11 @@ jobs: ref: main path: gatling - - name: Checkout gatling/gatling-highcharts - uses: actions/checkout@v2 + - name: Setup JDK + uses: actions/setup-java@v2 with: - path: gatling-highcharts + distribution: 'zulu' + java-version: '8' - name: Setup Scala uses: olafurpg/setup-scala@v10 diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 4173edb..d9c43c1 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -31,10 +31,11 @@ jobs: fetch-depth: 0 # indicates all history for all branches and tags token: ${{ secrets.GATLING_CI_TOKEN }} # for tag to trigger other workflows (release) - - name: Setup Scala - uses: olafurpg/setup-scala@v10 + - name: Setup JDK + uses: actions/setup-java@v2 with: - java-version: "adopt@1.8" + distribution: 'zulu' + java-version: '8' - name: Cache SBT uses: actions/cache@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 896b350..91de1d8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,10 +20,11 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Setup Scala - uses: olafurpg/setup-scala@v10 + - name: Setup JDK + uses: actions/setup-java@v2 with: - java-version: "adopt@1.8" + distribution: 'zulu' + java-version: '8' - name: Prepare environment env: