@@ -490,6 +490,22 @@ jobs:
490490 echo "koncur_ref=${KONCUR_REF}" >>"$GITHUB_OUTPUT"
491491 echo "Using KONCUR_REF \`${KONCUR_REF}\`" >>"$GITHUB_STEP_SUMMARY"
492492
493+ # See https://github.com/konveyor/ci/issues/224
494+ setup-kantra-matrix :
495+ runs-on : ubuntu-latest
496+ if : ${{ inputs.run_koncur_kantra_tests }}
497+ outputs :
498+ matrix : ${{ steps.set-matrix.outputs.matrix }}
499+ steps :
500+ - name : Build matrix based on inputs
501+ id : set-matrix
502+ run : |
503+ if [[ "${{ inputs.run_windows_kantra_tests }}" == "true" ]]; then
504+ echo 'matrix={"include":[{"os":"linux","runner":"ubuntu-24.04-arm"},{"os":"windows","runner":"windows-latest"}]}' >> "$GITHUB_OUTPUT"
505+ else
506+ echo 'matrix={"include":[{"os":"linux","runner":"ubuntu-24.04-arm"}]}' >> "$GITHUB_OUTPUT"
507+ fi
508+
493509 koncur-hub-tests :
494510 needs : [check-images, extract-koncur-ref]
495511 runs-on : ubuntu-latest
@@ -560,18 +576,11 @@ jobs:
560576 retention-days : 3
561577
562578 koncur-kantra-tests :
563- needs : [check-images, extract-koncur-ref]
579+ needs : [check-images, extract-koncur-ref, setup-kantra-matrix ]
564580 runs-on : ${{ matrix.runner }}
565- # See https://github.com/konveyor/ci/issues/224
566- if : ${{ inputs.run_koncur_kantra_tests && (matrix.os != 'windows' || inputs.run_windows_kantra_tests) }}
567581 strategy :
568582 fail-fast : false
569- matrix :
570- include :
571- - os : linux
572- runner : ubuntu-24.04-arm
573- - os : windows
574- runner : windows-latest
583+ matrix : ${{ fromJSON(needs.setup-kantra-matrix.outputs.matrix) }}
575584 steps :
576585 - name : Download and install kantra (linux)
577586 if : ${{ matrix.os == 'linux' }}
0 commit comments