From 8cd2c97982847b5bf322afb3423e3efbb7fa8fdb Mon Sep 17 00:00:00 2001 From: Bruno Oliveira da Silva Date: Mon, 28 Mar 2022 13:57:17 -0300 Subject: [PATCH] Fix the breaking changes introduced by setup-java --- .github/workflows/ci.yml | 9 +++++++++ .github/workflows/codeql-java-analysis.yml | 1 + .github/workflows/codeql-js-adapter-analysis.yml | 1 + .github/workflows/codeql-theme-analysis.yml | 1 + .github/workflows/operator-ci.yml | 1 + .github/workflows/release-operator-container.yml | 1 + 6 files changed, 14 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ea7494eb7a..7f71f1b507 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,6 +24,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-java@v2 with: + distribution: 'zulu' java-version: ${{ env.DEFAULT_JDK_VERSION }} - name: Update maven settings run: mkdir -p ~/.m2 ; cp .github/settings.xml ~/.m2/ @@ -68,6 +69,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-java@v2 with: + distribution: 'zulu' java-version: ${{ env.DEFAULT_JDK_VERSION }} - name: Update maven settings run: mkdir -p ~/.m2 ; cp .github/settings.xml ~/.m2/ @@ -109,6 +111,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-java@v2 with: + distribution: 'zulu' java-version: ${{ env.DEFAULT_JDK_VERSION }} - name: Update maven settings run: mkdir -p ~/.m2 ; cp .github/settings.xml ~/.m2/ @@ -183,6 +186,7 @@ jobs: - uses: actions/setup-java@v2 if: ${{ github.event_name != 'pull_request' || matrix.server != 'undertow-map-hot-rod' || env.GIT_HOTROD_RELEVANT_DIFF != 0 }} with: + distribution: 'zulu' java-version: ${{ env.DEFAULT_JDK_VERSION }} - name: Update maven settings if: ${{ github.event_name != 'pull_request' || matrix.server != 'undertow-map-hot-rod' || env.GIT_HOTROD_RELEVANT_DIFF != 0 }} @@ -250,6 +254,7 @@ jobs: - uses: actions/setup-java@v2 if: ${{ github.event_name != 'pull_request' || env.GIT_DIFF != 0 }} with: + distribution: 'zulu' java-version: ${{ env.DEFAULT_JDK_VERSION }} - name: Update maven settings if: ${{ github.event_name != 'pull_request' || env.GIT_DIFF != 0 }} @@ -289,6 +294,7 @@ jobs: - uses: actions/setup-java@v2 if: ${{ github.event_name != 'pull_request' || env.GIT_DIFF != 0 }} with: + distribution: 'zulu' java-version: ${{ env.DEFAULT_JDK_VERSION }} - name: Update maven settings if: ${{ github.event_name != 'pull_request' || env.GIT_DIFF != 0 }} @@ -362,6 +368,7 @@ jobs: name: keycloak-artifacts.zip - uses: actions/setup-java@v2 with: + distribution: 'zulu' java-version: ${{ env.DEFAULT_JDK_VERSION }} - name: Update maven settings run: mkdir -p ~/.m2 ; cp .github/settings.xml ~/.m2/ @@ -411,6 +418,7 @@ jobs: name: keycloak-artifacts.zip - uses: actions/setup-java@v2 with: + distribution: 'zulu' java-version: ${{ env.DEFAULT_JDK_VERSION }} - name: Update maven settings run: mkdir -p ~/.m2 ; cp .github/settings.xml ~/.m2/ @@ -463,6 +471,7 @@ jobs: - uses: actions/setup-java@v2 with: + distribution: 'zulu' java-version: 8 - name: Update maven settings run: mkdir -p ~/.m2 ; cp .github/settings.xml ~/.m2/ diff --git a/.github/workflows/codeql-java-analysis.yml b/.github/workflows/codeql-java-analysis.yml index 22304e2315..c8f7474df3 100644 --- a/.github/workflows/codeql-java-analysis.yml +++ b/.github/workflows/codeql-java-analysis.yml @@ -24,6 +24,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-java@v2 with: + distribution: 'zulu' java-version: '11' - name: Update maven settings diff --git a/.github/workflows/codeql-js-adapter-analysis.yml b/.github/workflows/codeql-js-adapter-analysis.yml index cbe2a2fa77..4478ea2aa7 100644 --- a/.github/workflows/codeql-js-adapter-analysis.yml +++ b/.github/workflows/codeql-js-adapter-analysis.yml @@ -24,6 +24,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-java@v2 with: + distribution: 'zulu' java-version: '11' - name: Update maven settings diff --git a/.github/workflows/codeql-theme-analysis.yml b/.github/workflows/codeql-theme-analysis.yml index 5f1ad9f44e..9d77d7ba74 100644 --- a/.github/workflows/codeql-theme-analysis.yml +++ b/.github/workflows/codeql-theme-analysis.yml @@ -24,6 +24,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-java@v2 with: + distribution: 'zulu' java-version: '11' - name: Update maven settings diff --git a/.github/workflows/operator-ci.yml b/.github/workflows/operator-ci.yml index 1aa55a1816..7436975db5 100644 --- a/.github/workflows/operator-ci.yml +++ b/.github/workflows/operator-ci.yml @@ -26,6 +26,7 @@ jobs: run: mkdir -p ~/.m2 ; cp .github/settings.xml ~/.m2/ - uses: actions/setup-java@v2 with: + distribution: 'zulu' java-version: ${{ env.JDK_VERSION }} - name: Cache Maven packages id: cache diff --git a/.github/workflows/release-operator-container.yml b/.github/workflows/release-operator-container.yml index 692c7a38ac..ce077a6e8b 100644 --- a/.github/workflows/release-operator-container.yml +++ b/.github/workflows/release-operator-container.yml @@ -37,6 +37,7 @@ jobs: - uses: actions/setup-java@v2 with: + distribution: 'zulu' java-version: ${{ env.JDK_VERSION }} - name: Cache Maven packages