From b09728762ed23aeb91696b314130615013a3e170 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira da Silva Date: Mon, 28 Mar 2022 12:51:51 -0300 Subject: [PATCH] Update to the latest version of the official actions used by Keycloak Resolves #10971 --- .github/workflows/ci.yml | 90 +++++++++---------- .github/workflows/codeql-java-analysis.yml | 4 +- .../workflows/codeql-js-adapter-analysis.yml | 4 +- .github/workflows/codeql-theme-analysis.yml | 4 +- .github/workflows/operator-ci.yml | 6 +- .github/workflows/release-container.yml | 2 +- .../workflows/release-operator-container.yml | 6 +- 7 files changed, 58 insertions(+), 58 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index db56c887d58..ea7494eb7ad 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,15 +21,15 @@ jobs: if: ${{ ( github.event_name != 'schedule' ) || ( github.event_name == 'schedule' && github.repository == 'keycloak/keycloak' ) }} runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v2 with: java-version: ${{ env.DEFAULT_JDK_VERSION }} - name: Update maven settings run: mkdir -p ~/.m2 ; cp .github/settings.xml ~/.m2/ - name: Cache Maven packages id: cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ~/.m2/repository @@ -46,7 +46,7 @@ jobs: - name: Store Keycloak artifacts id: store-keycloak - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: keycloak-artifacts.zip retention-days: 1 @@ -65,14 +65,14 @@ jobs: runs-on: ubuntu-latest needs: build steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v2 with: java-version: ${{ env.DEFAULT_JDK_VERSION }} - name: Update maven settings run: mkdir -p ~/.m2 ; cp .github/settings.xml ~/.m2/ - name: Cache Maven packages - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.m2/repository key: cache-2-${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} @@ -81,7 +81,7 @@ jobs: run: rm -rf ~/.m2/repository/org/keycloak >/dev/null || true - name: Download built keycloak id: download-keycloak - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: path: ~/.m2/repository/org/keycloak/ name: keycloak-artifacts.zip @@ -93,7 +93,7 @@ jobs: fi - name: Unit test reports - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 if: failure() with: name: reports-unit-tests @@ -106,14 +106,14 @@ jobs: runs-on: ubuntu-latest needs: build steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v2 with: java-version: ${{ env.DEFAULT_JDK_VERSION }} - name: Update maven settings run: mkdir -p ~/.m2 ; cp .github/settings.xml ~/.m2/ - name: Cache Maven packages - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.m2/repository key: cache-2-${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} @@ -122,7 +122,7 @@ jobs: run: rm -rf ~/.m2/repository/org/keycloak >/dev/null || true - name: Download built keycloak id: download-keycloak - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: path: ~/.m2/repository/org/keycloak/ name: keycloak-artifacts.zip @@ -134,7 +134,7 @@ jobs: fi - name: Model test reports - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 if: failure() with: name: reports-model-tests @@ -152,7 +152,7 @@ jobs: tests: ['group1','group2','group3'] fail-fast: false steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 2 @@ -161,7 +161,7 @@ jobs: - name: Cache Maven packages if: ${{ github.event_name != 'pull_request' || matrix.server != 'undertow-map-hot-rod' || env.GIT_HOTROD_RELEVANT_DIFF != 0 }} - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.m2/repository key: cache-2-${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} @@ -170,7 +170,7 @@ jobs: - name: Download built keycloak if: ${{ github.event_name != 'pull_request' || matrix.server != 'undertow-map-hot-rod' || env.GIT_HOTROD_RELEVANT_DIFF != 0 }} id: download-keycloak - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: path: ~/.m2/repository/org/keycloak/ name: keycloak-artifacts.zip @@ -180,7 +180,7 @@ jobs: # find ~ -name *dist*.zip # ls -lR ~/.m2/repository - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 if: ${{ github.event_name != 'pull_request' || matrix.server != 'undertow-map-hot-rod' || env.GIT_HOTROD_RELEVANT_DIFF != 0 }} with: java-version: ${{ env.DEFAULT_JDK_VERSION }} @@ -207,7 +207,7 @@ jobs: exit $TEST_RESULT - name: Base test reports - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 if: failure() with: name: reports-${{ matrix.server }}-base-tests-${{ matrix.tests }} @@ -220,7 +220,7 @@ jobs: needs: build runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 2 @@ -229,7 +229,7 @@ jobs: - name: Cache Maven packages if: ${{ github.event_name != 'pull_request' || env.GIT_DIFF != 0 }} - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.m2/repository key: cache-2-${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} @@ -242,12 +242,12 @@ jobs: - name: Download built keycloak if: ${{ github.event_name != 'pull_request' || env.GIT_DIFF != 0 }} id: download-keycloak - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: path: ~/.m2/repository/org/keycloak/ name: keycloak-artifacts.zip - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 if: ${{ github.event_name != 'pull_request' || env.GIT_DIFF != 0 }} with: java-version: ${{ env.DEFAULT_JDK_VERSION }} @@ -265,7 +265,7 @@ jobs: - name: Cluster test reports if: failure() - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: reports-cluster-tests retention-days: 14 @@ -279,14 +279,14 @@ jobs: env: MAVEN_OPTS: -Xmx1024m steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 2 - name: Check whether this phase should run run: echo "GIT_DIFF=$[ $( git diff --name-only HEAD^ | egrep -ic 'crossdc|infinispan' ) + $( git diff HEAD^ pom.xml | egrep -ic '\+\s+' ) ]" >> $GITHUB_ENV - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 if: ${{ github.event_name != 'pull_request' || env.GIT_DIFF != 0 }} with: java-version: ${{ env.DEFAULT_JDK_VERSION }} @@ -296,7 +296,7 @@ jobs: - name: Cache Maven packages if: ${{ github.event_name != 'pull_request' || env.GIT_DIFF != 0 }} - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.m2/repository key: cache-2-${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} @@ -309,7 +309,7 @@ jobs: - name: Download built keycloak if: ${{ github.event_name != 'pull_request' || env.GIT_DIFF != 0 }} id: download-keycloak - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: path: ~/.m2/repository/org/keycloak/ name: keycloak-artifacts.zip @@ -328,7 +328,7 @@ jobs: - name: Cross-DC test reports if: failure() - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: reports-cross-dc-tests retention-days: 14 @@ -344,9 +344,9 @@ jobs: env: MAVEN_OPTS: -Xmx1024m steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Cache Maven packages - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.m2/repository key: cache-2-${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} @@ -356,11 +356,11 @@ jobs: - name: Download built keycloak id: download-keycloak - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: path: ~/.m2/repository/org/keycloak/ name: keycloak-artifacts.zip - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: java-version: ${{ env.DEFAULT_JDK_VERSION }} - name: Update maven settings @@ -376,7 +376,7 @@ jobs: exit $TEST_RESULT - name: Quarkus cluster test reports - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 if: failure() with: name: reports-quarkus-cluster-tests @@ -393,9 +393,9 @@ jobs: env: MAVEN_OPTS: -Xmx1024m steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Cache Maven packages - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.m2/repository key: cache-2-${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} @@ -405,11 +405,11 @@ jobs: - name: Download built keycloak id: download-keycloak - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: path: ~/.m2/repository/org/keycloak/ name: keycloak-artifacts.zip - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: java-version: ${{ env.DEFAULT_JDK_VERSION }} - name: Update maven settings @@ -439,7 +439,7 @@ jobs: exit $TEST_RESULT - name: Quarkus test reports - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 if: failure() with: name: reports-quarkus-tests @@ -452,22 +452,22 @@ jobs: needs: build runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: repository: keycloak/keycloak-quickstarts ref: main # default is "latest" - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: path: keycloak - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: java-version: 8 - name: Update maven settings run: mkdir -p ~/.m2 ; cp .github/settings.xml ~/.m2/ - name: Cache Maven packages - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.m2/repository key: cache-2-${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} @@ -476,7 +476,7 @@ jobs: run: rm -rf ~/.m2/repository/org/keycloak >/dev/null || true - name: Download built keycloak id: download-keycloak - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: path: ~/.m2/repository/org/keycloak/ name: keycloak-artifacts.zip @@ -495,7 +495,7 @@ jobs: - name: Archive logs if: ${{ always() }} - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: quickstarts-test-logs retention-days: 2 diff --git a/.github/workflows/codeql-java-analysis.yml b/.github/workflows/codeql-java-analysis.yml index c18a35cff68..22304e23150 100644 --- a/.github/workflows/codeql-java-analysis.yml +++ b/.github/workflows/codeql-java-analysis.yml @@ -21,8 +21,8 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v2 with: java-version: '11' diff --git a/.github/workflows/codeql-js-adapter-analysis.yml b/.github/workflows/codeql-js-adapter-analysis.yml index fda1cb93e3d..cbe2a2fa77d 100644 --- a/.github/workflows/codeql-js-adapter-analysis.yml +++ b/.github/workflows/codeql-js-adapter-analysis.yml @@ -21,8 +21,8 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v2 with: java-version: '11' diff --git a/.github/workflows/codeql-theme-analysis.yml b/.github/workflows/codeql-theme-analysis.yml index 4a13383b866..5f1ad9f44ef 100644 --- a/.github/workflows/codeql-theme-analysis.yml +++ b/.github/workflows/codeql-theme-analysis.yml @@ -21,8 +21,8 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v2 with: java-version: '11' diff --git a/.github/workflows/operator-ci.yml b/.github/workflows/operator-ci.yml index aed6947b1eb..1aa55a18164 100644 --- a/.github/workflows/operator-ci.yml +++ b/.github/workflows/operator-ci.yml @@ -21,15 +21,15 @@ jobs: if: ${{ ( github.event_name != 'schedule' ) || ( github.event_name == 'schedule' && github.repository == 'keycloak/keycloak' ) }} runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Update maven settings run: mkdir -p ~/.m2 ; cp .github/settings.xml ~/.m2/ - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: java-version: ${{ env.JDK_VERSION }} - name: Cache Maven packages id: cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ~/.m2/repository diff --git a/.github/workflows/release-container.yml b/.github/workflows/release-container.yml index aefd18f83db..c9b9421e72d 100644 --- a/.github/workflows/release-container.yml +++ b/.github/workflows/release-container.yml @@ -12,7 +12,7 @@ runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up QEMU uses: docker/setup-qemu-action@v1 diff --git a/.github/workflows/release-operator-container.yml b/.github/workflows/release-operator-container.yml index 973ab5a5a0d..692c7a38ac1 100644 --- a/.github/workflows/release-operator-container.yml +++ b/.github/workflows/release-operator-container.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Container metadata id: meta @@ -35,13 +35,13 @@ jobs: username: ${{ secrets.QUAY_USERNAME }} password: ${{ secrets.QUAY_TOKEN }} - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: java-version: ${{ env.JDK_VERSION }} - name: Cache Maven packages id: cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ~/.m2/repository