From 9cf69a5009e0b2d104387da100011dd5b6fac793 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 21 Jun 2024 05:11:20 +0000 Subject: [PATCH 1/2] updated v2.30.0 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5cb367d2..e7338ebf 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "2.24.0" %} +{% set version = "2.30.0" %} package: name: ray-packages @@ -6,7 +6,7 @@ package: source: url: https://github.com/ray-project/ray/archive/ray-{{ version }}.tar.gz - sha256: 9eec094e79b34fad48b736205752e7e57b4afff1153780314c91bd8ef5a373fe + sha256: 854d549a77f0b0e810d1e9a18e7becf984279e2a0bfad5bed508f500ff770e34 patches: - patches/0001-patch-redis-for-ar-ranlib.patch - patches/0002-Disable-making-entry-scripts.patch @@ -17,7 +17,7 @@ source: - patches/0005-Vendor-grpc-1.62.2.patch build: - number: 1 + number: 0 skip: true # [py in (312, 38)] # Need these up here for conda-smithy to handle them properly. From 4c73e87003c1966e68f30a4b072fe58ccc3bf0a0 Mon Sep 17 00:00:00 2001 From: mattip Date: Sun, 23 Jun 2024 09:12:40 +0300 Subject: [PATCH 2/2] patch to allow bazel 6.3.2 --- recipe/meta.yaml | 2 ++ recipe/patches/0006-use-bazel-6.3.2.patch | 25 +++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 recipe/patches/0006-use-bazel-6.3.2.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e7338ebf..0e20090c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -15,6 +15,8 @@ source: # Keep in sync with current or active migration of libgrpc to avoid # ABI breakage - patches/0005-Vendor-grpc-1.62.2.patch + # conda-forge's latest bazel is 6.3.2 + - patches/0006-use-bazel-6.3.2.patch build: number: 0 diff --git a/recipe/patches/0006-use-bazel-6.3.2.patch b/recipe/patches/0006-use-bazel-6.3.2.patch new file mode 100644 index 00000000..928a1080 --- /dev/null +++ b/recipe/patches/0006-use-bazel-6.3.2.patch @@ -0,0 +1,25 @@ +From 9204abe3efea101fc0a0e477dd124d58e012aa7e Mon Sep 17 00:00:00 2001 +From: mattip +Date: Sat, 22 Jun 2024 22:48:25 +0300 +Subject: [PATCH] use bazel 6.3.2 + +--- + WORKSPACE | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/WORKSPACE b/WORKSPACE +index cf7d84bc88..4e33e2cd70 100644 +--- a/WORKSPACE ++++ b/WORKSPACE +@@ -29,7 +29,7 @@ load("@bazel_skylib//lib:versions.bzl", "versions") + + # Please keep this in sync with the .bazelversion file. + versions.check( + maximum_bazel_version = "6.5.0", +- minimum_bazel_version = "6.5.0", ++ minimum_bazel_version = "6.3.0", + ) + +-- +2.34.1 +