@@ -30,31 +30,23 @@ concurrency:
3030cancel-in-progress :true
3131
3232jobs :
33- resolve_build_targets :
34- name :Resolve Build Targets
35- runs-on :ubuntu-latest
36- outputs :
37- build_targets :${{ steps.resolve_build_targets.outputs.buildTargets }}
38- steps :
39- -name :Resolve Build Targets
40- id :resolve_build_targets
41- uses :avalin/unity-ci-templates/.github/actions/resolve-build-targets@main
42- with :
43- buildType :${{ inputs.buildType }}
44- buildTargetsInput :${{ inputs.buildTargets }}
45- buildTargetsRepoVar :${{ vars.BUILD_TARGETS }}
33+ group_build_targets :
34+ name :🧮 Group Build Targets
35+ uses :./.github/workflows/group-build-targets-by-os.yml
36+ with :
37+ buildTargets :${{ inputs.buildTargets }}
4638
4739generate_matrix :
4840name :🧮 Generate Dry Build Matrix
4941runs-on :ubuntu-latest
50- needs :[resolve_build_targets ]
42+ needs :[group_build_targets ]
5143outputs :
5244matrix :${{ steps.set-matrix.outputs.matrix }}
5345steps :
5446 -name :🧮 Create Dry Build Matrix
5547id :set-matrix
5648run :|
57- grouped='${{ needs.resolve_build_targets .outputs.build_targets }}'
49+ grouped='${{ needs.group_build_targets .outputs.validBuildTargets }}'
5850 echo "📦 Grouped targets: $grouped"
5951
6052matrix=$(echo "$grouped" | jq -c '
@@ -102,12 +94,12 @@ jobs:
10294retentionDays :${{ inputs.retentionDays }}
10395
10496summarize_builds :
105- needs :[resolve_build_targets , dry_build_targets, combine_builds ]
97+ needs :[group_build_targets , dry_build_targets, combine_builds ]
10698if :always()
10799uses :./.github/workflows/summarize-builds.yml
108100with :
109101projectName :${{ inputs.projectName }}
110102buildVersion :${{ inputs.buildVersion }}
111- groupedBuildTargets :${{ needs.resolve_build_targets .outputs.build_targets }}
103+ groupedBuildTargets :${{ needs.group_build_targets .outputs.validBuildTargets }}
112104combineRequested :${{ inputs.combineArtifacts }}
113105combinedCreated :${{ (needs.combine_builds.result == 'success' && needs.combine_builds.outputs.created) || 'false' }}