Skip to content

Commit ee6f01b

Browse files
upgrade to latest dependencies (knative#6196)
bumping knative.dev/hack e92a16a...c142b48: > c142b48 Refactor release script to gh CLI (# 408) > f8be0cc Update community files (# 407) Signed-off-by: Knative Automation <[email protected]>
1 parent b5777d6 commit ee6f01b

File tree

4 files changed

+26
-28
lines changed

4 files changed

+26
-28
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.21
55
require (
66
github.com/google/go-github/v32 v32.1.0
77
gopkg.in/yaml.v2 v2.3.0
8-
knative.dev/hack v0.0.0-20241227080210-e92a16ae0893
8+
knative.dev/hack v0.0.0-20250116150306-c142b4835bc5
99
)
1010

1111
require (

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8X
2323
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
2424
gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
2525
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
26-
knative.dev/hack v0.0.0-20241227080210-e92a16ae0893 h1:zy7LwNJ2S7obPMHVAtxQgZPXxBTZzoxHbtb6uhxOl7Q=
27-
knative.dev/hack v0.0.0-20241227080210-e92a16ae0893/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY=
26+
knative.dev/hack v0.0.0-20250116150306-c142b4835bc5 h1:CwLVoSblWmfaIkgRFX2LcEA0uYZo+nOhdPatsz+QL9w=
27+
knative.dev/hack v0.0.0-20250116150306-c142b4835bc5/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY=

vendor/knative.dev/hack/release.sh

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,10 @@ export GOFLAGS="-ldflags=-s -ldflags=-w"
9090
export GITHUB_TOKEN=""
9191
readonly IMAGES_REFS_FILE="${IMAGES_REFS_FILE:-$(mktemp -d)/images_refs.txt}"
9292

93-
# Convenience function to run the hub tool.
94-
# Parameters: $1..$n - arguments to hub.
95-
function hub_tool() {
96-
# Pinned to SHA because of https://github.com/github/hub/issues/2517
97-
go_run github.com/github/hub/v2@363513a "$@"
93+
# Convenience function to run the GitHub CLI tool `gh`.
94+
# Parameters: $1..$n - arguments to gh.
95+
function gh_tool() {
96+
go_run github.com/cli/cli/v2/cmd/[email protected] "$@"
9897
}
9998

10099
# Shortcut to "git push" that handles authentication.
@@ -193,7 +192,7 @@ function prepare_dot_release() {
193192
# Support tags in two formats
194193
# - knative-v1.0.0
195194
# - v1.0.0
196-
releases="$(hub_tool release | cut -d '-' -f2)"
195+
releases="$(gh_tool release list --json tagName --jq '.[].tagName' | cut -d '-' -f2)"
197196
echo "Current releases are: ${releases}"
198197
[[ $? -eq 0 ]] || abort "cannot list releases"
199198
# If --release-branch passed, restrict to that release
@@ -218,7 +217,7 @@ function prepare_dot_release() {
218217
# Ensure there are new commits in the branch, otherwise we don't create a new release
219218
setup_branch
220219
# Use the original tag (ie. potentially with a knative- prefix) when determining the last version commit sha
221-
local github_tag="$(hub_tool release | grep "${last_version}")"
220+
local github_tag="$(gh_tool release list --json tagName --jq '.[].tagName' | grep "${last_version}")"
222221
local last_release_commit="$(git rev-list -n 1 "${github_tag}")"
223222
local last_release_commit_filtered="$(git rev-list --invert-grep --grep "\[skip-dot-release\]" -n 1 "${github_tag}")"
224223
local release_branch_commit="$(git rev-list -n 1 upstream/"${RELEASE_BRANCH}")"
@@ -239,7 +238,7 @@ function prepare_dot_release() {
239238
# If --release-notes not used, copy from the latest release
240239
if [[ -z "${RELEASE_NOTES}" ]]; then
241240
RELEASE_NOTES="$(mktemp)"
242-
hub_tool release show -f "%b" "${github_tag}" > "${RELEASE_NOTES}"
241+
gh_tool release view "${github_tag}" --json "body" --jq '.body' > "${RELEASE_NOTES}"
243242
echo "Release notes from ${last_version} copied to ${RELEASE_NOTES}"
244243
fi
245244
}
@@ -640,18 +639,12 @@ function set_latest_to_highest_semver() {
640639

641640
local last_version release_id # don't combine with assignment else $? will be 0
642641

643-
last_version="$(hub_tool -p release | cut -d'-' -f2 | grep '^v[0-9]\+\.[0-9]\+\.[0-9]\+$'| sort -r -V | head -1)"
642+
last_version="$(gh_tool release list --json tagName --jq '.[].tagName' | cut -d'-' -f2 | grep '^v[0-9]\+\.[0-9]\+\.[0-9]\+$'| sort -r -V | head -1)"
644643
if ! [[ $? -eq 0 ]]; then
645644
abort "cannot list releases"
646645
fi
647-
648-
release_id="$(hub_tool api "/repos/${ORG_NAME}/${REPO_NAME}/releases/tags/knative-${last_version}" | jq .id)"
649-
if [[ $? -ne 0 ]]; then
650-
abort "cannot get relase id from github"
651-
fi
652-
653-
hub_tool api --method PATCH "/repos/${ORG_NAME}/${REPO_NAME}/releases/$release_id" \
654-
-F make_latest=true > /dev/null || abort "error setting $last_version to 'latest'"
646+
647+
gh_tool release edit "knative-${last_version}" --latest > /dev/null || abort "error setting $last_version to 'latest'"
655648
echo "Github release ${last_version} set as 'latest'"
656649
}
657650

@@ -742,12 +735,14 @@ function publish_to_github() {
742735
local description="$(mktemp)"
743736
local attachments_dir="$(mktemp -d)"
744737
local commitish=""
738+
local target_branch=""
745739
local github_tag="knative-${TAG}"
746740

747741
# Copy files to a separate dir
742+
# shellcheck disable=SC2068
748743
for artifact in $@; do
749744
cp ${artifact} "${attachments_dir}"/
750-
attachments+=("--attach=${artifact}#$(basename ${artifact})")
745+
attachments+=("${artifact}#$(basename ${artifact})")
751746
done
752747
echo -e "${title}\n" > "${description}"
753748
if [[ -n "${RELEASE_NOTES}" ]]; then
@@ -774,13 +769,16 @@ function publish_to_github() {
774769
git tag -a "${github_tag}" -m "${title}"
775770
git_push tag "${github_tag}"
776771

777-
[[ -n "${RELEASE_BRANCH}" ]] && commitish="--commitish=${RELEASE_BRANCH}"
772+
[[ -n "${RELEASE_BRANCH}" ]] && target_branch="--target=${RELEASE_BRANCH}"
778773
for i in {2..0}; do
779-
hub_tool release create \
780-
${attachments[@]} \
781-
--file="${description}" \
782-
"${commitish}" \
783-
"${github_tag}" && return 0
774+
# shellcheck disable=SC2068
775+
gh_tool release create \
776+
"${github_tag}" \
777+
--title "${title}" \
778+
--notes-file "${description}" \
779+
"${target_branch}" \
780+
${attachments[@]} && return 0
781+
784782
if [[ "${i}" -gt 0 ]]; then
785783
echo "Error publishing the release, retrying in 15s..."
786784
sleep 15

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ golang.org/x/crypto/openpgp/s2k
2222
# gopkg.in/yaml.v2 v2.3.0
2323
## explicit
2424
gopkg.in/yaml.v2
25-
# knative.dev/hack v0.0.0-20241227080210-e92a16ae0893
25+
# knative.dev/hack v0.0.0-20250116150306-c142b4835bc5
2626
## explicit; go 1.21
2727
knative.dev/hack
2828
# go.opencensus.io => go.opencensus.io v0.20.2

0 commit comments

Comments
 (0)