Skip to content

Commit

Permalink
upgrade to latest dependencies (#335)
Browse files Browse the repository at this point in the history
bumping knative.dev/eventing 4cc5ecf...ee96d0b:
  > ee96d0b removed ginkgo from the project and ran update-codegen and mod tidy (# 5878)
bumping knative.dev/pkg 51b9e7f...3cc697a:
  > 3cc697a upgrade to latest dependencies (# 2344)
bumping knative.dev/hack 0f69979...29f86c2:
  > 29f86c2 fix latest version when running in GitHub actions (# 103)

Signed-off-by: Knative Automation <automation@knative.team>
  • Loading branch information
knative-automation committed Nov 9, 2021
1 parent 6867803 commit eb93df2
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 28 deletions.
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ require (
k8s.io/client-go v0.21.4
k8s.io/code-generator v0.21.4
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7
knative.dev/eventing v0.27.1-0.20211104083501-4cc5ecf9635e
knative.dev/hack v0.0.0-20211104075903-0f69979bbb7d
knative.dev/pkg v0.0.0-20211104101302-51b9e7f161b4
knative.dev/eventing v0.27.1-0.20211108073202-ee96d0b3b429
knative.dev/hack v0.0.0-20211105231158-29f86c2653b5
knative.dev/pkg v0.0.0-20211108064904-3cc697a3cb09
)

replace (
Expand Down
12 changes: 6 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1213,17 +1213,17 @@ k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 h1:vEx13qjvaZ4yfObSSXW7Br
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE=
k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw=
k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
knative.dev/eventing v0.27.1-0.20211104083501-4cc5ecf9635e h1:4xp0ymTitsPH1Dra+kEfyhDYZ5I134sLAL6IrB8tL9w=
knative.dev/eventing v0.27.1-0.20211104083501-4cc5ecf9635e/go.mod h1:T1rafFeW26ZWlEHcGEWVIYVTG6spstS8e8N/C0v0U9s=
knative.dev/eventing v0.27.1-0.20211108073202-ee96d0b3b429 h1:WqtS6djERttPe2vqAih/N+W83C/jSD0V8CIJZwxCwf8=
knative.dev/eventing v0.27.1-0.20211108073202-ee96d0b3b429/go.mod h1:WsdNr/+tT/IqPeWzZuG3O9/zla/ZFniJC8PgJJWGT58=
knative.dev/hack v0.0.0-20211101195839-11d193bf617b/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
knative.dev/hack v0.0.0-20211102174540-b284d49386cc/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
knative.dev/hack v0.0.0-20211104075903-0f69979bbb7d h1:osgDQ4YarclNcFctyQULF/coJhzvAMOTjyBgPHLclso=
knative.dev/hack v0.0.0-20211104075903-0f69979bbb7d/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
knative.dev/hack v0.0.0-20211105231158-29f86c2653b5 h1:9scsqLnVcUh6wnMY0vYo8MGBy1NAkjpjoukyhhkChU4=
knative.dev/hack v0.0.0-20211105231158-29f86c2653b5/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
knative.dev/hack/schema v0.0.0-20211102174540-b284d49386cc/go.mod h1:ffjwmdcrH5vN3mPhO8RrF2KfNnbHeCE2C60A+2cv3U0=
knative.dev/pkg v0.0.0-20211101212339-96c0204a70dc/go.mod h1:SkfDk9bWIiNZD7XtILGkG7AKVyF/M6M0bGxLgl0SYL8=
knative.dev/pkg v0.0.0-20211103135647-464034912f7e/go.mod h1:a+9AWOb0zOaBVU6xoPgTvEA7vfMnLjPnK4SX3ciSHKE=
knative.dev/pkg v0.0.0-20211104101302-51b9e7f161b4 h1:X1CGp8wqBcIWfuz5uIH1yo011/SFPMPPP7Qe8KyRiyI=
knative.dev/pkg v0.0.0-20211104101302-51b9e7f161b4/go.mod h1:EKhRrRSAHrnJwQPfgUyrmHgLCam9xcRh79t+G3MJu4k=
knative.dev/pkg v0.0.0-20211108064904-3cc697a3cb09 h1:EuziitWfjhtDEI7vyNV79AtqFia5rACAFOy2rbinVo4=
knative.dev/pkg v0.0.0-20211108064904-3cc697a3cb09/go.mod h1:YiSfFDMdYHZTuO5XS8UzxSeOEmocy+Kb2YOGik9C8lw=
knative.dev/reconciler-test v0.0.0-20211101213739-c5f938aa9974/go.mod h1:gTsbLk496j/M9xqMpx/liyCQ0X3bwDpRtcs2Zzws364=
pgregory.net/rapid v0.3.3/go.mod h1:UYpPVyjFHzYBGHIxLFoupi8vwk6rXNzRY9OMvVxFIOU=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
Expand Down
59 changes: 43 additions & 16 deletions vendor/knative.dev/hack/library.sh
Original file line number Diff line number Diff line change
Expand Up @@ -771,6 +771,7 @@ function current_branch() {
# Get the branch name from Prow's env var, see https://github.com/kubernetes/test-infra/blob/master/prow/jobs.md.
# Otherwise, try getting the current branch from git.
(( IS_PROW )) && branch_name="${PULL_BASE_REF:-}"
[[ -z "${branch_name}" ]] && branch_name="${GITHUB_BASE_REF:-}"
[[ -z "${branch_name}" ]] && branch_name="$(git rev-parse --abbrev-ref HEAD)"
echo "${branch_name}"
}
Expand Down Expand Up @@ -835,30 +836,56 @@ function shellcheck_new_files() {
fi
}

# Note: if using Github checkout action please ensure you fetch all tags prior to calling
# this function
#
# ie.
# - uses: actions/checkout@v2
# with:
# fetch-depth: 0
#
# See: https://github.com/actions/checkout#fetch-all-history-for-all-tags-and-branches
function latest_version() {
local branch_name="$(current_branch)"

if [ "$branch_name" = "master" ] || [ "$branch_name" = "main" ]; then
# For main branch, simply use git tag without major version, this will work even
# if the release tag is not in the main
# Use the latest release for main
if [[ "$branch_name" == "main" ]] || [[ "$branch_name" == "master" ]]; then
git tag -l "*$(git tag -l "*v[0-9]*" | cut -d '-' -f2 | sort -r --version-sort | head -n1)*"
return
fi

# Ideally we shouldn't need to treat release branches differently but
# there are scenarios where git describe will return newer tags than
# the ones on the current branch
#
# ie. create a PR pulling commits from 0.24 into a release-0.23 branch
if [[ "$branch_name" == "release-"* ]]; then
# Infer major, minor version from the branch name
local tag="${branch_name##release-}"
else
## Assumption here is we are on a release branch
local major_minor="${branch_name##release-}"
local major_version="$(major_version $major_minor)"
local minor_version="$(minor_version $major_minor)"
# Nearest tag with the `knative-` prefix
local tag=$(git describe --abbrev=0 --match "knative-v[0-9]*")

# Hardcode the jump back from 1.0
if [ "$major_version" = "1" ] && [ "$minor_version" == 0 ]; then
local tag='v0.26*'
else
# Adjust the minor down by one
local tag="*v$major_version.$(( minor_version - 1 ))*"
fi
# Fallback to older tag scheme vX.Y.Z
[[ -z "${tag}" ]] && tag=$(git describe --abbrev=0 --match "v[0-9]*")

# Drop the prefix
tag="${tag##knative-}"
fi

# Get the latest patch release for the major minor
git tag -l "${tag}*" | sort -r --version-sort | head -n1
local major_version="$(major_version ${tag})"
local minor_version="$(minor_version ${tag})"

# Hardcode the jump back from 1.0
if [ "$major_version" = "1" ] && [ "$minor_version" = "0" ]; then
local tag_filter='v0.26*'
else
# Adjust the minor down by one
local tag_filter="*v$major_version.$(( minor_version - 1 ))*"
fi

# Get the latest patch release for the major minor
git tag -l "${tag_filter}" | sort -r --version-sort | head -n1
}

# Initializations that depend on previous functions.
Expand Down
6 changes: 3 additions & 3 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1003,7 +1003,7 @@ k8s.io/utils/buffer
k8s.io/utils/integer
k8s.io/utils/pointer
k8s.io/utils/trace
# knative.dev/eventing v0.27.1-0.20211104083501-4cc5ecf9635e
# knative.dev/eventing v0.27.1-0.20211108073202-ee96d0b3b429
## explicit
knative.dev/eventing/pkg/adapter/v2
knative.dev/eventing/pkg/adapter/v2/util/crstatusevent
Expand Down Expand Up @@ -1035,10 +1035,10 @@ knative.dev/eventing/pkg/client/injection/client
knative.dev/eventing/pkg/kncloudevents
knative.dev/eventing/pkg/metrics
knative.dev/eventing/pkg/metrics/source
# knative.dev/hack v0.0.0-20211104075903-0f69979bbb7d
# knative.dev/hack v0.0.0-20211105231158-29f86c2653b5
## explicit
knative.dev/hack
# knative.dev/pkg v0.0.0-20211104101302-51b9e7f161b4
# knative.dev/pkg v0.0.0-20211108064904-3cc697a3cb09
## explicit
knative.dev/pkg/apis
knative.dev/pkg/apis/duck
Expand Down

0 comments on commit eb93df2

Please sign in to comment.