Skip to content

Fix trusted RC recovery context / 修正 RC 復原情境 #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hitoshic1982 merged 1 commit into from
Aug 5, 2026
Merged

Fix trusted RC recovery context / 修正 RC 復原情境 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/preview-packages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ jobs:
REF_NAME: ${{ github.ref_name }}
PR_NUMBER: ${{ github.event.pull_request.number }}
RUN_NUMBER: ${{ github.run_number }}
RELEASE_TAG: ${{ needs.release-gate.outputs.tag }}
run: bash packaging/resolve-metadata.sh
- name: Run the complete Windows regression and packaging audits
run: |
Expand Down Expand Up @@ -128,6 +129,7 @@ jobs:
REF_NAME: ${{ github.ref_name }}
PR_NUMBER: ${{ github.event.pull_request.number }}
RUN_NUMBER: ${{ github.run_number }}
RELEASE_TAG: ${{ needs.release-gate.outputs.tag }}
run: bash packaging/resolve-metadata.sh
- name: Run shared and packaging audits
run: |
Expand Down Expand Up @@ -199,6 +201,7 @@ jobs:
REF_NAME: ${{ github.ref_name }}
PR_NUMBER: ${{ github.event.pull_request.number }}
RUN_NUMBER: ${{ github.run_number }}
RELEASE_TAG: ${{ needs.release-gate.outputs.tag }}
run: bash packaging/resolve-metadata.sh
- name: Run shared and packaging audits
run: |
Expand Down Expand Up @@ -270,6 +273,7 @@ jobs:
REF_NAME: ${{ github.ref_name }}
PR_NUMBER: ${{ github.event.pull_request.number }}
RUN_NUMBER: ${{ github.run_number }}
RELEASE_TAG: ${{ needs.release-gate.outputs.tag }}
run: bash packaging/resolve-metadata.sh
- name: Run shared and packaging audits
run: |
Expand Down
13 changes: 11 additions & 2 deletions packaging/resolve-metadata.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,15 @@ if [[ ! "${project_version}" =~ ^[0-9]+\.[0-9]+\.[0-9]+([-.][0-9A-Za-z.-]+)?$ ]]
exit 2
fi

case "${REF_TYPE:-}:${EVENT_NAME:-}" in
if [[ -n "${RELEASE_TAG:-}" ]]; then
[[ "${RELEASE_TAG}" =~ ^v1\.1\.0-rc\.([1-9][0-9]*)$ ]] || {
echo "Recovery release tag must match v1.1.0-rc.N: ${RELEASE_TAG}" >&2
exit 3
}
package_label="${RELEASE_TAG}"
app_version="${package_label#v}"
else
case "${REF_TYPE:-}:${EVENT_NAME:-}" in
tag:*)
package_label="${REF_NAME:?REF_NAME is required for tag builds}"
app_version="${package_label#v}"
Expand All @@ -23,7 +31,8 @@ case "${REF_TYPE:-}:${EVENT_NAME:-}" in
package_label="v${project_version}-preview.build${RUN_NUMBER:?RUN_NUMBER is required}"
app_version="${project_version}"
;;
esac
esac
fi

if [[ ! "${app_version}" =~ ^[0-9]+\.[0-9]+\.[0-9]+([-.][0-9A-Za-z.-]+)?$ ]]; then
echo "Resolved tag version is not valid semantic version text: ${app_version}" >&2
Expand Down
6 changes: 4 additions & 2 deletions packaging/validate-release-tag.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ input_tag="${INPUT_TAG:-}"
tag_commit="${TAG_COMMIT:?TAG_COMMIT is required}"
main_ref="${MAIN_REF:-origin/main}"
publish="false"
release_tag=""
resolved_commit="$(git rev-parse "${tag_commit}^{commit}")"

if [[ "${event_name}" == "workflow_dispatch" && -n "${input_tag}" ]]; then
Expand All @@ -29,12 +30,13 @@ if [[ ( "${event_name}" == "push" || "${event_name}" == "workflow_dispatch" ) &&
exit 3
fi
publish="true"
release_tag="${ref_name}"
fi

if [[ -n "${GITHUB_OUTPUT:-}" ]]; then
printf 'publish=%s\n' "${publish}" >> "${GITHUB_OUTPUT}"
printf 'tag=%s\n' "${ref_name}" >> "${GITHUB_OUTPUT}"
printf 'tag=%s\n' "${release_tag}" >> "${GITHUB_OUTPUT}"
printf 'build_commit=%s\n' "${resolved_commit}" >> "${GITHUB_OUTPUT}"
else
printf 'publish=%s\ntag=%s\nbuild_commit=%s\n' "${publish}" "${ref_name}" "${resolved_commit}"
printf 'publish=%s\ntag=%s\nbuild_commit=%s\n' "${publish}" "${release_tag}" "${resolved_commit}"
fi
6 changes: 5 additions & 1 deletion tests/PackagingAudit/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@ void Check(bool condition, string name)

Check(metadataScript.Contains("REF_TYPE", StringComparison.Ordinal) &&
metadataScript.Contains("PR-${PR_NUMBER", StringComparison.Ordinal) &&
metadataScript.Contains("preview.build", StringComparison.Ordinal),
metadataScript.Contains("preview.build", StringComparison.Ordinal) &&
metadataScript.Contains("RELEASE_TAG", StringComparison.Ordinal) &&
Regex.Matches(workflow, @"RELEASE_TAG: \$\{\{ needs\.release-gate\.outputs\.tag \}\}").Count >= 4,
"Artifact labels distinguish tags, PR validation, and main-branch preview builds");
Check(sbomScript.Contains("Microsoft.Sbom.DotNetTool", StringComparison.Ordinal) &&
sbomScript.Contains("tool_version=\"4.1.5\"", StringComparison.Ordinal) &&
Expand All @@ -79,6 +81,8 @@ void Check(bool condition, string name)

Check(releaseGateScript.Contains("^v1\\.1\\.0-rc\\.([1-9][0-9]*)$", StringComparison.Ordinal) &&
releaseGateScript.Contains("git merge-base --is-ancestor", StringComparison.Ordinal) &&
releaseGateScript.Contains("release_tag=\"\"", StringComparison.Ordinal) &&
releaseGateScript.Contains("release_tag=\"${ref_name}\"", StringComparison.Ordinal) &&
releaseGateScript.Contains("build_commit=%s", StringComparison.Ordinal) &&
workflow.Contains("+refs/heads/main:refs/remotes/origin/main", StringComparison.Ordinal),
"Release authority requires an exact positive RC tag whose commit is contained in origin/main");
Expand Down
Loading