forked from pingcap/tidb
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This is an automated cherry-pick of pingcap#57791
Signed-off-by: ti-chi-bot <[email protected]>
- Loading branch information
1 parent
e62cfd5
commit 690eeed
Showing
3 changed files
with
159 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5520,26 +5520,85 @@ def go_deps(): | |
name = "com_github_onsi_ginkgo_v2", | ||
build_file_proto_mode = "disable_global", | ||
importpath = "github.com/onsi/ginkgo/v2", | ||
<<<<<<< HEAD | ||
sha256 = "c5cdb980ec4d450f3df8a471718494fd9192a5751cbeff14b9025fa9c0c86b16", | ||
strip_prefix = "github.com/onsi/ginkgo/[email protected]", | ||
urls = [ | ||
"http://bazel-cache.pingcap.net:8080/gomod/github.com/onsi/ginkgo/v2/com_github_onsi_ginkgo_v2-v2.9.1.zip", | ||
"http://ats.apps.svc/gomod/github.com/onsi/ginkgo/v2/com_github_onsi_ginkgo_v2-v2.9.1.zip", | ||
"https://cache.hawkingrei.com/gomod/github.com/onsi/ginkgo/v2/com_github_onsi_ginkgo_v2-v2.9.1.zip", | ||
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/onsi/ginkgo/v2/com_github_onsi_ginkgo_v2-v2.9.1.zip", | ||
======= | ||
sha256 = "4865aab6c56b0d29a93cfe56206b586f1c9f36fde5a66e85650576344861b7cc", | ||
strip_prefix = "github.com/onsi/ginkgo/[email protected]", | ||
urls = [ | ||
"http://bazel-cache.pingcap.net:8080/gomod/github.com/onsi/ginkgo/v2/com_github_onsi_ginkgo_v2-v2.13.0.zip", | ||
"http://ats.apps.svc/gomod/github.com/onsi/ginkgo/v2/com_github_onsi_ginkgo_v2-v2.13.0.zip", | ||
"https://cache.hawkingrei.com/gomod/github.com/onsi/ginkgo/v2/com_github_onsi_ginkgo_v2-v2.13.0.zip", | ||
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/onsi/ginkgo/v2/com_github_onsi_ginkgo_v2-v2.13.0.zip", | ||
>>>>>>> 7518a29fb1d (br: prompt k8s.io/api version (#57791)) | ||
], | ||
) | ||
go_repository( | ||
name = "com_github_onsi_gomega", | ||
build_file_proto_mode = "disable_global", | ||
importpath = "github.com/onsi/gomega", | ||
<<<<<<< HEAD | ||
sha256 = "c7c39c6aa6a544939044a2a51ff86cd4d911a3801358d83ee48278fdbe5fe42c", | ||
strip_prefix = "github.com/onsi/[email protected]", | ||
urls = [ | ||
"http://bazel-cache.pingcap.net:8080/gomod/github.com/onsi/gomega/com_github_onsi_gomega-v1.27.4.zip", | ||
"http://ats.apps.svc/gomod/github.com/onsi/gomega/com_github_onsi_gomega-v1.27.4.zip", | ||
"https://cache.hawkingrei.com/gomod/github.com/onsi/gomega/com_github_onsi_gomega-v1.27.4.zip", | ||
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/onsi/gomega/com_github_onsi_gomega-v1.27.4.zip", | ||
======= | ||
sha256 = "923e8d0a1f95b3989f31c45142dee0b80a0aaa00cfa210bbd4d059f7046d12a8", | ||
strip_prefix = "github.com/onsi/[email protected]", | ||
urls = [ | ||
"http://bazel-cache.pingcap.net:8080/gomod/github.com/onsi/gomega/com_github_onsi_gomega-v1.29.0.zip", | ||
"http://ats.apps.svc/gomod/github.com/onsi/gomega/com_github_onsi_gomega-v1.29.0.zip", | ||
"https://cache.hawkingrei.com/gomod/github.com/onsi/gomega/com_github_onsi_gomega-v1.29.0.zip", | ||
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/onsi/gomega/com_github_onsi_gomega-v1.29.0.zip", | ||
], | ||
) | ||
go_repository( | ||
name = "com_github_opencontainers_go_digest", | ||
build_file_proto_mode = "disable_global", | ||
importpath = "github.com/opencontainers/go-digest", | ||
sha256 = "615efb31ff6cd71035b8aa38c3659d8b4da46f3cd92ac807cb50449adfe37c86", | ||
strip_prefix = "github.com/opencontainers/[email protected]", | ||
urls = [ | ||
"http://bazel-cache.pingcap.net:8080/gomod/github.com/opencontainers/go-digest/com_github_opencontainers_go_digest-v1.0.0.zip", | ||
"http://ats.apps.svc/gomod/github.com/opencontainers/go-digest/com_github_opencontainers_go_digest-v1.0.0.zip", | ||
"https://cache.hawkingrei.com/gomod/github.com/opencontainers/go-digest/com_github_opencontainers_go_digest-v1.0.0.zip", | ||
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/opencontainers/go-digest/com_github_opencontainers_go_digest-v1.0.0.zip", | ||
], | ||
) | ||
go_repository( | ||
name = "com_github_opencontainers_image_spec", | ||
build_file_proto_mode = "disable_global", | ||
importpath = "github.com/opencontainers/image-spec", | ||
sha256 = "d842127b6038c1a74c2bb609d75bdde0ac9c7cde5c354ac82c4f953ce08d0c08", | ||
strip_prefix = "github.com/opencontainers/[email protected]", | ||
urls = [ | ||
"http://bazel-cache.pingcap.net:8080/gomod/github.com/opencontainers/image-spec/com_github_opencontainers_image_spec-v1.0.2.zip", | ||
"http://ats.apps.svc/gomod/github.com/opencontainers/image-spec/com_github_opencontainers_image_spec-v1.0.2.zip", | ||
"https://cache.hawkingrei.com/gomod/github.com/opencontainers/image-spec/com_github_opencontainers_image_spec-v1.0.2.zip", | ||
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/opencontainers/image-spec/com_github_opencontainers_image_spec-v1.0.2.zip", | ||
], | ||
) | ||
go_repository( | ||
name = "com_github_opencontainers_runtime_spec", | ||
build_file_proto_mode = "disable_global", | ||
importpath = "github.com/opencontainers/runtime-spec", | ||
sha256 = "bd1531bb27014e2a16ea4bf0b56bff7688555bb859f651c1e4375f4b782269ec", | ||
strip_prefix = "github.com/opencontainers/[email protected]", | ||
urls = [ | ||
"http://bazel-cache.pingcap.net:8080/gomod/github.com/opencontainers/runtime-spec/com_github_opencontainers_runtime_spec-v1.0.2.zip", | ||
"http://ats.apps.svc/gomod/github.com/opencontainers/runtime-spec/com_github_opencontainers_runtime_spec-v1.0.2.zip", | ||
"https://cache.hawkingrei.com/gomod/github.com/opencontainers/runtime-spec/com_github_opencontainers_runtime_spec-v1.0.2.zip", | ||
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/opencontainers/runtime-spec/com_github_opencontainers_runtime_spec-v1.0.2.zip", | ||
>>>>>>> 7518a29fb1d (br: prompt k8s.io/api version (#57791)) | ||
], | ||
) | ||
go_repository( | ||
|
@@ -9658,26 +9717,46 @@ def go_deps(): | |
name = "io_k8s_api", | ||
build_file_proto_mode = "disable_global", | ||
importpath = "k8s.io/api", | ||
<<<<<<< HEAD | ||
sha256 = "417e394e3510035a617292da245c07d606d9a4c0674361719f6a08dc0bf67b68", | ||
strip_prefix = "k8s.io/[email protected]", | ||
urls = [ | ||
"http://bazel-cache.pingcap.net:8080/gomod/k8s.io/api/io_k8s_api-v0.27.2.zip", | ||
"http://ats.apps.svc/gomod/k8s.io/api/io_k8s_api-v0.27.2.zip", | ||
"https://cache.hawkingrei.com/gomod/k8s.io/api/io_k8s_api-v0.27.2.zip", | ||
"https://storage.googleapis.com/pingcapmirror/gomod/k8s.io/api/io_k8s_api-v0.27.2.zip", | ||
======= | ||
sha256 = "ae7b519f36431bc55fa56c47a51c1c37cf9e0df7e9d23741b3e839426d2627ff", | ||
strip_prefix = "k8s.io/[email protected]", | ||
urls = [ | ||
"http://bazel-cache.pingcap.net:8080/gomod/k8s.io/api/io_k8s_api-v0.29.11.zip", | ||
"http://ats.apps.svc/gomod/k8s.io/api/io_k8s_api-v0.29.11.zip", | ||
"https://cache.hawkingrei.com/gomod/k8s.io/api/io_k8s_api-v0.29.11.zip", | ||
"https://storage.googleapis.com/pingcapmirror/gomod/k8s.io/api/io_k8s_api-v0.29.11.zip", | ||
>>>>>>> 7518a29fb1d (br: prompt k8s.io/api version (#57791)) | ||
], | ||
) | ||
go_repository( | ||
name = "io_k8s_apimachinery", | ||
build_file_proto_mode = "disable_global", | ||
importpath = "k8s.io/apimachinery", | ||
<<<<<<< HEAD | ||
sha256 = "1f2f04041166fcddead7f31f03149f33ee6fdc08db1093ddbc027191204c2f86", | ||
strip_prefix = "k8s.io/[email protected]", | ||
urls = [ | ||
"http://bazel-cache.pingcap.net:8080/gomod/k8s.io/apimachinery/io_k8s_apimachinery-v0.27.2.zip", | ||
"http://ats.apps.svc/gomod/k8s.io/apimachinery/io_k8s_apimachinery-v0.27.2.zip", | ||
"https://cache.hawkingrei.com/gomod/k8s.io/apimachinery/io_k8s_apimachinery-v0.27.2.zip", | ||
"https://storage.googleapis.com/pingcapmirror/gomod/k8s.io/apimachinery/io_k8s_apimachinery-v0.27.2.zip", | ||
======= | ||
sha256 = "8dd5f53bf72f7bd6323bcc8f9f45823b30fc350daee4ab2d9e27cf1960d06b25", | ||
strip_prefix = "k8s.io/[email protected]", | ||
urls = [ | ||
"http://bazel-cache.pingcap.net:8080/gomod/k8s.io/apimachinery/io_k8s_apimachinery-v0.29.11.zip", | ||
"http://ats.apps.svc/gomod/k8s.io/apimachinery/io_k8s_apimachinery-v0.29.11.zip", | ||
"https://cache.hawkingrei.com/gomod/k8s.io/apimachinery/io_k8s_apimachinery-v0.29.11.zip", | ||
"https://storage.googleapis.com/pingcapmirror/gomod/k8s.io/apimachinery/io_k8s_apimachinery-v0.29.11.zip", | ||
>>>>>>> 7518a29fb1d (br: prompt k8s.io/api version (#57791)) | ||
], | ||
) | ||
go_repository( | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters