13.1 unable to tag
release-tools
is failing to tag for 13.1.0. The two attempted jobs fail at the same stage:
- https://ops.gitlab.net/gitlab-org/release/tools/-/jobs/1332102
- https://ops.gitlab.net/gitlab-org/release/tools/-/jobs/1332200
Summary from job log:
2020-06-19 16:23:17.207789 W ReleaseTools::RemoteRepository -- Failed to checkout -- {:branch=>"13-1-stable", :output=>"VERSION: needs merge\nerror: you need to resolve your current index first\nruby/proto/gitaly/version.rb: needs merge\n"}
rake aborted!
ReleaseTools::RemoteRepository::CannotCheckoutBranchError: 13-1-stable
warning: refname '203182ffe94da165d4ff81332b1b3fff9771e631' is ambiguous.
Git normally never creates a ref that ends with 40 hex characters
because it will be ignored when you just specify 40-hex. These refs
may be created by mistake. For example,
git switch -c $br $(git rev-parse ...)
where "$br" is somehow empty and a 40-hex ref is created. Please
examine these refs and maybe delete them. Turn this message off by
running "git config advice.objectNameWarning false"
fatal: A branch named '13-1-stable' already exists.
Sentry Error: https://sentry.gitlab.net/gitlab/release-tools/issues/1673035/?referrer=slack