search

kubernetes / publishing-bot

Code behind the robot to publish from staging to real repositories.
Apache License 2.0
84 stars 82 forks source link

Drop replace directives on tagged versions #416

Closed liggitt closed 7 months ago

liggitt commented 7 months ago

Follow up to https://github.com/kubernetes/publishing-bot/pull/415

There's a go-based step that adds semver tags that is adding back the replace directives.

Logs from this are seen in https://pastebin.com/raw/4ydkDMsY (for the 1.30.0-rc.0 tag cut)

This PR also drops replace when cutting tagged releases in the go tool (best reviewed without whitespace - https://github.com/kubernetes/publishing-bot/pull/416/files?w=1)

/cc @thockin @dims

dims commented 7 months ago

pasting logs inline as pastebin may go away

I0327 16:37:30.241511       1 publisher_logger.go:85] /publish_scripts/construct.sh code-generator release-1.30 release-1.30 apimachinery:release-1.30  /go-workspace/src/k8s.io/kubernetes/.git staging/src/k8s.io/code-generator kubernetes kubernetes k8s.io false */.gitattributes   master
        Running garbage collection.
        Fetching from origin.
        Cleaning up checkout.
        Branch origin/release-1.30 not found. Creating orphan release-1.30 branch.
        Fetching upstream changes.
        Upstream branch upstream/release-1.30 moved from '' to 'efa7ab29bd5303a403440ad9a5af01aca96e2b35'. We have to sync.
        Found repo without release-1.30 branch, creating initial commit.
        [release-1.30 (root-commit) 15df07d0990] Initial commit
        branch 'upstream-branch' set up to track 'upstream/release-1.30'.
        Checked out source commit efa7ab29bd5303a403440ad9a5af01aca96e2b35.
        Using branch point 227c2e7c2b2c05a9c8b2885460e28e4da25cf558 as new starting point for new branch release-1.30.
        Rewriting upstream branch release-1.30 to only include commits for staging/src/k8s.io/code-generator.
        Running git filter-branch ...
        Checking out branch release-1.30.
        Fixing up go.mod after a complete sync
        Looking up which commit in the release-1.30 branch of k8s.io/apimachinery corresponds to k8s.io/kubernetes commit a31a465405e52bf0ca1d29f17e2d534646074072.
        Checking out k8s.io/apimachinery to 25164f774551e54ff86b6d19a3132ad064537aa0
        Pseudo version v0.0.0-20240307044802-25164f774551 is already packaged up.
        Updating k8s.io/apimachinery to point to v0.0.0-20240307044802-25164f774551
        Committing go.mod
        Amending last merge with go.mod changes.
        Writing k8s.io/kubernetes commit lookup table to ../kube-commits-code-generator-release-1.30
        Removing all local copies of origin and upstream tags.
        Fetching tags from remote "upstream".
        Fetching tags from remote "origin".
        Computing mapping from kube commits to the local branch "release-1.30" at 71421176fc0eef696cd52a57a5357733a702ce88 because "kubernetes-1.30.0-rc.0" seems to be relevant.
        Writing source->dest hash mapping to "../tag-code-generator-kubernetes-1.30.0-rc.0-mapping"
        Checking that dependencies point to the actual tags in apimachinery.
        Checking out branch tag commit 71421176fc0eef696cd52a57a5357733a702ce88.
        Updating go.mod and go.sum to point to v0.30.0-rc.0 tag.
        v0.30.0-rc.0 for k8s.io/apimachinery is already packaged up.
        Bumping k8s.io/apimachinery in go.mod to 0407311be590a4faa7e79343d1e1cd5c965663b6.
        Completed running go mod tidy for v0.30.0-rc.0.
        Adding extra commit to update dependencies to v0.30.0-rc.0 tag.
        Tagging 75dba27bf44cadabe12582a47b0899124e8da94c as "v0.30.0-rc.0".
        Tagging 75dba27bf44cadabe12582a47b0899124e8da94c as "kubernetes-1.30.0-rc.0".
k8s-ci-robot commented 7 months ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dims, liggitt

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files: - ~~[OWNERS](https://github.com/kubernetes/publishing-bot/blob/master/OWNERS)~~ [dims] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment