From f6c30ea2712cbcb9d5d8f630c881462551a0a397 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ferreira?= Date: Wed, 9 Oct 2024 17:58:10 +0100 Subject: [PATCH 1/2] use "Set up Azul JDK 1.8 and SBT" in scripted-jdk-packager job --- .github/workflows/validate-pr.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/validate-pr.yml b/.github/workflows/validate-pr.yml index d4ad17d15..c60dd5d01 100644 --- a/.github/workflows/validate-pr.yml +++ b/.github/workflows/validate-pr.yml @@ -183,14 +183,10 @@ jobs: key: ${{ runner.os }}-ivy-${{ hashFiles('**/*.sbt') }} restore-keys: | ${{ runner.os }}-ivy- - - name: Download JDK 1.8 - run: wget -O zulu-jdk.tar.gz https://cdn.azul.com/zulu/bin/zulu8.38.0.13-ca-fx-jdk8.0.212-linux_x64.tar.gz - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 + - name: Set up Azul JDK 1.8 and SBT + uses: olafurpg/setup-scala@v10 with: - java-version: 1.8 - # the standard zulu dist doesn't include javafx - jdkFile: 'zulu-jdk.tar.gz' + java-version: zulu@1.8 - name: Validate run: sbt "^validateJdkPackagerTravis" From 449e2085a156c54beffd066ce7905439687bef73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ferreira?= Date: Wed, 9 Oct 2024 18:12:52 +0100 Subject: [PATCH 2/2] use custom url --- .github/workflows/validate-pr.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/validate-pr.yml b/.github/workflows/validate-pr.yml index c60dd5d01..3ec6147ad 100644 --- a/.github/workflows/validate-pr.yml +++ b/.github/workflows/validate-pr.yml @@ -186,7 +186,8 @@ jobs: - name: Set up Azul JDK 1.8 and SBT uses: olafurpg/setup-scala@v10 with: - java-version: zulu@1.8 + # the standard zulu dist doesn't include javafx + java-version: zulu@1.8=tgz+https://cdn.azul.com/zulu/bin/zulu8.38.0.13-ca-fx-jdk8.0.212-linux_x64.tar.gz - name: Validate run: sbt "^validateJdkPackagerTravis"