@@ -540,16 +540,18 @@ jobs:
540540 "messagingctl ${{ needs.validate.outputs.version }}"
541541 fi
542542 coordinator_in_release="$(python3 release/scripts/release_roster.py \
543- coordinator-in-release "${{ needs.validate.outputs.version }}")"
543+ coordinator-binaries- in-release "${{ needs.validate.outputs.version }}")"
544544 if [[ "${coordinator_in_release}" == true ]]; then
545545 test "$("dist/bin/coordinator-${{ needs.validate.outputs.tag }}-linux-amd64" --version)" = \
546546 "coordinator ${{ needs.validate.outputs.version }}"
547547 test "$("dist/bin/coordinatorctl-${{ needs.validate.outputs.tag }}-linux-amd64" --version)" = \
548548 "coordinatorctl ${{ needs.validate.outputs.version }}"
549- test "$(dist/image-bin/coordinator --version)" = \
550- "coordinator ${{ needs.validate.outputs.version }}"
551- test "$(dist/image-bin/coordinatorctl --version)" = \
552- "coordinatorctl ${{ needs.validate.outputs.version }}"
549+ if [[ "$(python3 release/scripts/release_roster.py coordinator-in-release "${{ needs.validate.outputs.version }}")" == true ]]; then
550+ test "$(dist/image-bin/coordinator --version)" = \
551+ "coordinator ${{ needs.validate.outputs.version }}"
552+ test "$(dist/image-bin/coordinatorctl --version)" = \
553+ "coordinatorctl ${{ needs.validate.outputs.version }}"
554+ fi
553555 coordinatorctl_binary="${GITHUB_WORKSPACE}/dist/bin/coordinatorctl-${{ needs.validate.outputs.tag }}-linux-amd64"
554556 coordinator_project="${RUNNER_TEMP}/release-coordinator-project"
555557 "${coordinatorctl_binary}" init --directory "${coordinator_project}"
@@ -835,6 +837,13 @@ jobs:
835837 test "$("platform/${asset}" --version)" = \
836838 "schedulingctl ${{ needs.validate.outputs.version }}"
837839 fi
840+ component_args=()
841+ if [[ "${{ needs.validate.outputs.exclude_discovery }}" == true ]]; then
842+ component_args+=(--exclude-unit discovery)
843+ fi
844+ bash release/scripts/build-additional-platform-binaries.sh \
845+ "${{ needs.validate.outputs.version }}" "${{ needs.validate.outputs.tag }}" \
846+ "${{ matrix.target }}" platform "${component_args[@]}"
838847 mkdir -p candidate-platform
839848 mv platform candidate-platform/platform
840849
@@ -862,7 +871,7 @@ jobs:
862871 name : Build native macOS ${{ matrix.group }} payload once
863872 needs : validate
864873 runs-on : macos-26
865- timeout-minutes : 60
874+ timeout-minutes : 90
866875 permissions :
867876 contents : read
868877 strategy :
@@ -890,12 +899,17 @@ jobs:
890899 set -euo pipefail
891900 rustup toolchain install 1.95.0 \
892901 --profile minimal --target aarch64-apple-darwin
902+ component_args=()
903+ if [[ "${{ needs.validate.outputs.exclude_discovery }}" == true ]]; then
904+ component_args+=(--exclude-unit discovery)
905+ fi
893906 release/scripts/build-release-native-platform.sh \
894907 --group "${{ matrix.group }}" \
895908 --purpose candidate_input \
896909 --source-sha "${{ needs.validate.outputs.source_sha }}" \
897910 --version "${{ needs.validate.outputs.version }}" \
898- --output candidate-native-shard
911+ --output candidate-native-shard \
912+ "${component_args[@]}"
899913 # These groups contain complete installer toolsets. Exercise the
900914 # relocated release bytes while the Cargo output is unavailable.
901915 if [[ "${{ matrix.group }}" == core || "${{ matrix.group }}" == casework ||
@@ -1581,6 +1595,10 @@ jobs:
15811595 set -euo pipefail
15821596 prefix="candidate-native-macos-arm64-${{ needs.validate.outputs.version }}"
15831597 suffix="${{ needs.validate.outputs.source_sha }}-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}"
1598+ component_args=()
1599+ if [[ "${{ needs.validate.outputs.exclude_discovery }}" == true ]]; then
1600+ component_args+=(--exclude-unit discovery)
1601+ fi
15841602 release/scripts/merge-release-native-platform-shards.py \
15851603 --version "${{ needs.validate.outputs.version }}" \
15861604 --source-sha "${{ needs.validate.outputs.source_sha }}" \
@@ -1590,7 +1608,8 @@ jobs:
15901608 --bregctl "inputs/${prefix}-bregctl-${suffix}" \
15911609 --casework "inputs/${prefix}-casework-${suffix}" \
15921610 --scheduling "inputs/${prefix}-scheduling-${suffix}" \
1593- --output "inputs/candidate-macos-arm64-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}"
1611+ --output "inputs/candidate-macos-arm64-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}" \
1612+ "${component_args[@]}"
15941613
15951614 - name : Install pinned candidate inspection tools
15961615 env :
@@ -2003,6 +2022,17 @@ jobs:
20032022 --client "${client}"
20042023 done
20052024 fi
2025+ component_args=()
2026+ if [[ "${{ needs.validate.outputs.exclude_discovery }}" == true ]]; then
2027+ component_args+=(--exclude-unit discovery)
2028+ fi
2029+ python3 release/scripts/additional_installers.py --package candidate/bundle-root \
2030+ --version "${version}" --tag "${{ needs.validate.outputs.tag }}" \
2031+ "${component_args[@]}"
2032+ python3 release/scripts/additional_installers.py --smoke candidate/bundle-root \
2033+ --scratch-root "${RUNNER_TEMP}" \
2034+ --version "${version}" --tag "${{ needs.validate.outputs.tag }}" \
2035+ "${component_args[@]}"
20062036 if (( client_major > 0 || client_minor >= 26 )); then
20072037 breg_installer="breg-${{ needs.validate.outputs.tag }}-install.sh"
20082038 awk -v version="${{ needs.validate.outputs.tag }}" '
0 commit comments