From 0f3601ca24680db93dee69591b2f67a2b5673e8e Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Thu, 9 Jul 2026 13:33:29 -0700 Subject: [PATCH] Revert "[release-branch.go1.26] Ship .asc signature alongside .sig (#2403)" This reverts commit 5c4ed04dc9c16a901262cae99e7e2f4377216180. --- eng/_util/cmd/sign/archive.go | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/eng/_util/cmd/sign/archive.go b/eng/_util/cmd/sign/archive.go index 17371c647a9..1ee24fb7b27 100644 --- a/eng/_util/cmd/sign/archive.go +++ b/eng/_util/cmd/sign/archive.go @@ -427,10 +427,10 @@ func (a *archive) prepareArchiveSignatures(ctx context.Context) ([]*fileToSign, if err := ctx.Err(); err != nil { return nil, err } - // Copy the archive file and add a ".sig" suffix. The signing process sends this new file to get a - // signature, then replaces its content in-place with the result. We need to preemptively make - // a renamed copy of the file so we end up with both the original file and signature on the - // machine. + // Copy the archive file to have .sig suffix, e.g. "tar.gz" to "tar.gz.sig". The signing + // process sends the "tar.gz.sig" file to get a signature, then replaces the "tar.gz.sig" + // file's content in-place with the result. We need to preemptively make a renamed copy of the + // file so we end up with both the original file and sig on the machine. log.Printf("Copying file for signature generation: %q -> %q", a.latestPath(), a.sigPath()) if err := copyFile(a.sigPath(), a.latestPath()); err != nil { return nil, err @@ -460,10 +460,6 @@ func (a *archive) copyToDestination(ctx context.Context) error { if err := copyFile(filepath.Join(*destinationDir, a.name+".sig"), a.sigPath()); err != nil { return err } - // Also produce an .asc file (same content) to match upstream Go's convention. - if err := copyFile(filepath.Join(*destinationDir, a.name+".asc"), a.sigPath()); err != nil { - return err - } return nil }