mirror of
https://github.com/keycloak/keycloak.git
synced 2026-02-03 20:39:33 -05:00
mixed-cluster-compatibility-tests fail due to incorrectly masked content (#45821)
Closes: #45745 Signed-off-by: Peter Zaoral <pepo48@gmail.com>
This commit is contained in:
parent
0023c0a881
commit
615b54e7e6
2 changed files with 48 additions and 18 deletions
28
.github/workflows/ci.yml
vendored
28
.github/workflows/ci.yml
vendored
|
|
@ -27,6 +27,13 @@ permissions:
|
|||
|
||||
jobs:
|
||||
|
||||
# Generate version compatibility matrix in a separate job to avoid multiline secret masking issues.
|
||||
version-compatibility:
|
||||
name: Version Compatibility Matrix
|
||||
uses: ./.github/workflows/version-compatibility-matrix.yml
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
conditional:
|
||||
name: Check conditional workflows and jobs
|
||||
runs-on: ubuntu-latest
|
||||
|
|
@ -38,7 +45,6 @@ jobs:
|
|||
ci-webauthn: ${{ steps.conditional.outputs.ci-webauthn }}
|
||||
ci-aurora: ${{ steps.auroradb-tests.outputs.run-aurora-tests }}
|
||||
ci-azure: ${{ steps.azure-tests.outputs.run-azure-tests }}
|
||||
ci-compatibility-matrix: ${{ steps.version-compatibility.outputs.matrix }}
|
||||
ci-additional-dbs: ${{ steps.additional-dbs-tests.outputs.run-additional-dbs-tests }}
|
||||
ci-admin-v2: ${{ steps.conditional.outputs.admin-v2 }}
|
||||
permissions:
|
||||
|
|
@ -79,20 +85,6 @@ jobs:
|
|||
fi
|
||||
echo "run-additional-dbs-tests=$RUN_ADDITIONAL_DBS_TESTS" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Version Compatibility Matrix
|
||||
id: version-compatibility
|
||||
env:
|
||||
GH_TOKEN: ${{ github.token }}
|
||||
run: |
|
||||
if [[ "${{ github.event_name }}" == "pull_request" ]]; then
|
||||
BRANCH="${{ github.base_ref }}"
|
||||
else
|
||||
BRANCH="${{ github.ref_name }}"
|
||||
fi
|
||||
MATRIX_JSON=$(./.github/scripts/version-compatibility.sh "${BRANCH}")
|
||||
echo "${MATRIX_JSON}"
|
||||
echo "matrix=${MATRIX_JSON}" >> $GITHUB_OUTPUT
|
||||
|
||||
build:
|
||||
name: Build
|
||||
if: needs.conditional.outputs.ci == 'true'
|
||||
|
|
@ -1189,15 +1181,15 @@ jobs:
|
|||
|
||||
mixed-cluster-compatibility-tests:
|
||||
name: Cluster Compatibility Tests
|
||||
if: needs.conditional.outputs.ci-compatibility-matrix != 'skip'
|
||||
if: needs.version-compatibility.outputs.matrix != 'skip'
|
||||
runs-on: ubuntu-latest
|
||||
needs:
|
||||
- build
|
||||
- conditional
|
||||
- version-compatibility
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
include: ${{ fromJSON(needs.conditional.outputs.ci-compatibility-matrix) }}
|
||||
include: ${{ fromJSON(needs.version-compatibility.outputs.matrix) }}
|
||||
timeout-minutes: 10
|
||||
|
||||
steps:
|
||||
|
|
|
|||
38
.github/workflows/version-compatibility-matrix.yml
vendored
Normal file
38
.github/workflows/version-compatibility-matrix.yml
vendored
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
name: Version Compatibility Matrix
|
||||
|
||||
# This workflow generates the version compatibility matrix for mixed-cluster tests.
|
||||
# It is separated from the main CI workflow to avoid multiline secret masking issues.
|
||||
# See: https://github.com/keycloak/keycloak/issues/45745
|
||||
|
||||
on:
|
||||
workflow_call:
|
||||
outputs:
|
||||
matrix:
|
||||
description: 'Version compatibility matrix JSON for mixed-cluster tests'
|
||||
value: ${{ jobs.generate-matrix.outputs.matrix }}
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
generate-matrix:
|
||||
name: Generate Matrix
|
||||
runs-on: ubuntu-latest
|
||||
outputs:
|
||||
matrix: ${{ steps.version-compatibility.outputs.matrix }}
|
||||
steps:
|
||||
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
|
||||
|
||||
- name: Version Compatibility Matrix
|
||||
id: version-compatibility
|
||||
env:
|
||||
GH_TOKEN: ${{ github.token }}
|
||||
run: |
|
||||
if [[ "${{ github.event_name }}" == "pull_request" ]]; then
|
||||
BRANCH="${{ github.base_ref }}"
|
||||
else
|
||||
BRANCH="${{ github.ref_name }}"
|
||||
fi
|
||||
MATRIX_JSON=$(./.github/scripts/version-compatibility.sh "${BRANCH}")
|
||||
echo "${MATRIX_JSON}"
|
||||
echo "matrix=${MATRIX_JSON}" >> $GITHUB_OUTPUT
|
||||
Loading…
Reference in a new issue