Make patch for up-porting the first release

wpilibsuite · Dec 17, 2024 · 31bd7c9 · 31bd7c9
1 parent 0c17a14
commit 31bd7c9
Show file tree

Hide file tree

Showing 11 changed files with 63 additions and 12 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -23,6 +23,16 @@ build:bullseye64 --platforms=@rules_bzlmodrio_toolchains//platforms/bullseye64
 build:bullseye64 --build_tag_filters=-no-bullseye
 build:bullseye64 --platform_suffix=bullseye64
 
+# bookworm32
+build:bookworm32 --platforms=@rules_bzlmodrio_toolchains//platforms/bookworm32
+build:bookworm32 --build_tag_filters=-no-bookworm
+build:bookworm32 --platform_suffix=bookworm32
+
+# bookworm64
+build:bookworm64 --platforms=@rules_bzlmodrio_toolchains//platforms/bookworm64
+build:bookworm64 --build_tag_filters=-no-bookworm
+build:bookworm64 --platform_suffix=bookworm64
+
 # rasppi
 build:raspi32 --platforms=@rules_bzlmodrio_toolchains//platforms/raspi32
 build:raspi32 --build_tag_filters=-no-raspi

diff --git a/.bazelrc-cc b/.bazelrc-cc
@@ -55,6 +55,16 @@ build:bullseye64 --incompatible_enable_cc_toolchain_resolution
 build:bullseye64 --copt=-std=c++20
 build:bullseye64 --features=compiler_param_file
 
+# bookworm32
+build:bookworm32 --incompatible_enable_cc_toolchain_resolution
+build:bookworm32 --copt=-std=c++20
+build:bookworm32 --features=compiler_param_file
+
+# bookworm64
+build:bookworm64 --incompatible_enable_cc_toolchain_resolution
+build:bookworm64 --copt=-std=c++20
+build:bookworm64 --features=compiler_param_file
+
 # rasppi
 build:raspi32 --incompatible_enable_cc_toolchain_resolution
 build:raspi32 --copt=-std=c++20

diff --git a/.clang-format b/.clang-format
@@ -0,0 +1,5 @@
+---
+Language:        Cpp
+BasedOnStyle:  Google
+FixNamespaceComments: true
+...
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -126,12 +126,12 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        # Build non-bzlmod, bullseye32:
+        # Build non-bzlmod, bullseye64:
         - { name: "windows - bullseye64",         os: windows-2022,   java_arch: "x64",     command: "build", config: "--noenable_bzlmod --config=bullseye64", bazel_options: "--output_user_root=C:\\bazelroot", }
         - { name: "ubuntu  - bullseye64",         os: ubuntu-22.04,   java_arch: "x64",     command: "build", config: "--noenable_bzlmod --config=bullseye64", bazel_options: "",                                 }
-        - { name: "macos   - bullseye64",         os: macos-14,       java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --config=bullseye32", bazel_options: "",                                 }
+        - { name: "macos   - bullseye64",         os: macos-14,       java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --config=bullseye64", bazel_options: "",                                 }
 
-        # Build bzlmod, bullseye32:
+        # Build bzlmod, bullseye64:
         - { name: "windows - bzlmod bullseye64",  os: windows-2022,   java_arch: "x64",     command: "build", config: "--enable_bzlmod --config=bullseye64", bazel_options: "--output_user_root=C:\\bazelroot", }
         - { name: "ubuntu  - bzlmod bullseye64",  os: ubuntu-22.04,   java_arch: "x64",     command: "build", config: "--enable_bzlmod --config=bullseye64", bazel_options: "",                                 }
         - { name: "macos   - bzlmod bullseye64",  os: macos-14,       java_arch: "aarch64", command: "build", config: "--enable_bzlmod --config=bullseye64", bazel_options: "",                                 }

diff --git a/MODULE.bazel b/MODULE.bazel
@@ -1,13 +1,13 @@
 module(
     name = "bzlmodrio-ni",
-    version = "2025.0.0",
+    version = "2025.0.0.bcr1",
     compatibility_level = 2025,
 )
 
 bazel_dep(name = "platforms", version = "0.0.9")
 bazel_dep(name = "rules_cc", version = "0.0.9")
 bazel_dep(name = "rules_java", version = "7.6.5")
-bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2024-1.bcr1")
+bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2025-1")
 
 setup_bzlmodrio_ni_cpp_dependencies = use_extension("//:maven_cpp_deps.bzl", "setup_bzlmodrio_ni_cpp_dependencies")
 use_repo(

diff --git a/private/non_bzlmod_dependencies/download_dependencies.bzl b/private/non_bzlmod_dependencies/download_dependencies.bzl
@@ -26,8 +26,8 @@ def download_dependencies():
     # Roborio Toolchain
     http_archive(
         name = "rules_bzlmodrio_toolchains",
-        sha256 = "2ef1cafce7f4fd4e909bb5de8b0dc771a934646afd55d5f100ff31f6b500df98",
-        url = "https://github.com/wpilibsuite/rules_bzlmodRio_toolchains/releases/download/2024-1.bcr1/rules_bzlmodRio_toolchains-2024-1.bcr1.tar.gz",
+        sha256 = "fe267e2af53c1def1e962700a9aeda9e8fdfa9fb46b72167c615ec0e25447dd6",
+        url = "https://github.com/wpilibsuite/rules_bzlmodRio_toolchains/releases/download/2025-1/rules_bzlmodRio_toolchains-2025-1.tar.gz",
     )
 
     ########################

diff --git a/private/non_bzlmod_dependencies/setup_dependencies.bzl b/private/non_bzlmod_dependencies/setup_dependencies.bzl
@@ -21,6 +21,12 @@ def _setup_toolchains():
         "@local_bullseye_64//:macos",
         "@local_bullseye_64//:linux",
         "@local_bullseye_64//:windows",
+        "@local_bookworm_32//:macos",
+        "@local_bookworm_32//:linux",
+        "@local_bookworm_32//:windows",
+        "@local_bookworm_64//:macos",
+        "@local_bookworm_64//:linux",
+        "@local_bookworm_64//:windows",
     )
 
 def _setup_cpp_dependencies():

diff --git a/tests/.bazelrc b/tests/.bazelrc
@@ -23,6 +23,16 @@ build:bullseye64 --platforms=@rules_bzlmodrio_toolchains//platforms/bullseye64
 build:bullseye64 --build_tag_filters=-no-bullseye
 build:bullseye64 --platform_suffix=bullseye64
 
+# bookworm32
+build:bookworm32 --platforms=@rules_bzlmodrio_toolchains//platforms/bookworm32
+build:bookworm32 --build_tag_filters=-no-bookworm
+build:bookworm32 --platform_suffix=bookworm32
+
+# bookworm64
+build:bookworm64 --platforms=@rules_bzlmodrio_toolchains//platforms/bookworm64
+build:bookworm64 --build_tag_filters=-no-bookworm
+build:bookworm64 --platform_suffix=bookworm64
+
 # rasppi
 build:raspi32 --platforms=@rules_bzlmodrio_toolchains//platforms/raspi32
 build:raspi32 --build_tag_filters=-no-raspi

diff --git a/tests/.bazelrc-cc b/tests/.bazelrc-cc
@@ -55,6 +55,16 @@ build:bullseye64 --incompatible_enable_cc_toolchain_resolution
 build:bullseye64 --copt=-std=c++20
 build:bullseye64 --features=compiler_param_file
 
+# bookworm32
+build:bookworm32 --incompatible_enable_cc_toolchain_resolution
+build:bookworm32 --copt=-std=c++20
+build:bookworm32 --features=compiler_param_file
+
+# bookworm64
+build:bookworm64 --incompatible_enable_cc_toolchain_resolution
+build:bookworm64 --copt=-std=c++20
+build:bookworm64 --features=compiler_param_file
+
 # rasppi
 build:raspi32 --incompatible_enable_cc_toolchain_resolution
 build:raspi32 --copt=-std=c++20

diff --git a/tests/MODULE.bazel b/tests/MODULE.bazel
@@ -9,11 +9,11 @@ bazel_dep(name = "rules_cc", version = "0.0.9")
 bazel_dep(name = "rules_java", version = "7.6.5")
 bazel_dep(name = "rules_jvm_external", version = "6.1")
 bazel_dep(name = "rules_bazelrio", version = "0.0.14")
-bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2024-1.bcr1")
+bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2025-1")
 bazel_dep(name = "rules_pmd", version = "7.2.0")
 bazel_dep(name = "rules_checkstyle", version = "10.12.2")
-bazel_dep(name = "rules_wpiformat", version = "2024.34")
-bazel_dep(name = "rules_wpi_styleguide", version = "2024.06.22")
+bazel_dep(name = "rules_wpiformat", version = "2024.45")
+bazel_dep(name = "rules_wpi_styleguide", version = "2024.11.19")
 bazel_dep(name = "rules_spotless", version = "2.40.0")
 
 maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")

diff --git a/tests/WORKSPACE b/tests/WORKSPACE
@@ -28,8 +28,8 @@ setup_dependencies()
 
 http_archive(
     name = "rules_wpi_styleguide",
-    sha256 = "0359cc1772a715d958a2f5648f8254ad8c34af1e84d1a852f3bfa79040334b76",
-    url = "https://github.com/bzlmodRio/rules_wpi_styleguide/releases/download/2024.06.22/rules_wpi_styleguide-2024.06.22.tar.gz",
+    sha256 = "b8215443ef1a6cc8170bc76203e44f22516614c58935e22c6a94b63656e2c88a",
+    url = "https://github.com/bzlmodRio/rules_wpi_styleguide/releases/download/2024.11.19/rules_wpi_styleguide-2024.11.19.tar.gz",
 )
 
 load("@rules_wpi_styleguide//dependencies:load_rule_dependencies.bzl", "load_styleguide_rule_dependencies")