From 2b15badc46db770a12b1cdd58373d4d723c9f1f3 Mon Sep 17 00:00:00 2001 From: Tony Aiuto Date: Mon, 15 Apr 2024 22:54:25 -0400 Subject: [PATCH 1/2] bump platforms to latest. The hope is that this fixes what is going wrong in the integration test --- MODULE.bazel | 2 +- WORKSPACE | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 16d95498..f05b7417 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -11,7 +11,7 @@ bazel_dep(name = "rules_python", version = "0.24.0") bazel_dep(name = "bazel_skylib", version = "1.2.0") # Only for development -bazel_dep(name = "platforms", version = "0.0.5", dev_dependency = True) +bazel_dep(name = "platforms", version = "0.0.9", dev_dependency = True) bazel_dep(name = "stardoc", version = "0.5.3", dev_dependency = True) bazel_dep(name = "rules_cc", version = "0.0.9", dev_dependency = True) diff --git a/WORKSPACE b/WORKSPACE index fe06be59..fee32ef2 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -36,10 +36,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( name = "platforms", - sha256 = "3a561c99e7bdbe9173aa653fd579fe849f1d8d67395780ab4770b1f381431d51", + sha256 = "5eda539c841265031c2f82d8ae7a3a6490bd62176e0c038fc469eabf91f6149b", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.7/platforms-0.0.7.tar.gz", - "https://github.com/bazelbuild/platforms/releases/download/0.0.7/platforms-0.0.7.tar.gz", + "https://github.com/bazelbuild/platforms/releases/download/0.0.9/platforms-0.0.9.tar.gz", ], ) From ea21d3860c64f7641a90812d7256082c461032e8 Mon Sep 17 00:00:00 2001 From: Tony Aiuto Date: Mon, 15 Apr 2024 23:06:01 -0400 Subject: [PATCH 2/2] use bazel 7.0.0 for stardoc test --- .bazelci/integration.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.bazelci/integration.yml b/.bazelci/integration.yml index 11b04d48..3cf24014 100644 --- a/.bazelci/integration.yml +++ b/.bazelci/integration.yml @@ -11,7 +11,8 @@ tasks: integration: name: rolling_distro platform: ubuntu1804 - bazel: rolling + # See https://github.com/bazelbuild/rules_pkg/issues/808 + bazel: 7.0.0 build_flags: - "--noenable_bzlmod" <<: *common