Update toolchain (#7)

wpilibsuite · Oct 19, 2023 · 79f3826 · 79f3826
1 parent e6bcc03
commit 79f3826
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 4 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -9,6 +9,7 @@ build:windows --copt=/WX
 build:windows --copt=/std:c++20
 build:windows --copt=/Zc:preprocessor
 build:windows --copt=/wd5105
+build:windows --cxxopt=/wd4146
 build:windows --cxxopt=/wd4267
 build:windows --cxxopt=/wd4244
 
@@ -18,6 +19,7 @@ build:windows_arm --copt=/WX
 build:windows_arm --copt=/std:c++20
 build:windows_arm --copt=/Zc:preprocessor
 build:windows_arm --copt=/wd5105
+build:windows_arm --cxxopt=/wd4146
 build:windows_arm --cxxopt=/wd4267
 build:windows_arm --cxxopt=/wd4244
 build:windows_arm --cpu=x64_arm64_windows

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,11 +13,13 @@ jobs:
         include:
         # Build standard, native
         - { name: "windows - native",        os: windows-2022,   command: "test",   config: "--config=windows",     bazel_options: "--output_user_root=C:\\bazelroot", }
+        - { name: "windows arm - native",    os: windows-2022,   command: "build",  config: "--config=windows_arm", bazel_options: "--output_user_root=C:\\bazelroot", }
         - { name: "ubuntu  - native",        os: ubuntu-latest,  command: "test",   config: "--config=linux",       bazel_options: "",                                 }
         - { name: "macos   - native",        os: macos-latest,   command: "test",   config: "--config=macos",       bazel_options: "",                                 }
 
         # Build bzlmod, native
         - { name: "windows - bzlmod native",     os: windows-2022,   command: "test",   config: "--enable_bzlmod --config=windows",     bazel_options: "--output_user_root=C:\\bazelroot", }
+        - { name: "windows arm - bzlmod native", os: windows-2022,   command: "build",  config: "--enable_bzlmod --config=windows_arm", bazel_options: "--output_user_root=C:\\bazelroot", }
         - { name: "ubuntu  - bzlmod native",     os: ubuntu-latest,  command: "test",   config: "--enable_bzlmod --config=linux",       bazel_options: "",                                 }
         - { name: "macos   - bzlmod native",     os: macos-latest,   command: "test",   config: "--enable_bzlmod --config=macos",       bazel_options: "",                                 }
 

diff --git a/MODULE.bazel b/MODULE.bazel
@@ -8,7 +8,7 @@ bazel_dep(name = "platforms", version = "0.0.7")
 bazel_dep(name = "rules_cc", version = "0.0.8")
 bazel_dep(name = "rules_java", version = "6.4.0")
 bazel_dep(name = "rules_bazelrio", version = "0.0.13")
-bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2023-7")
+bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2024-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
@@ -19,8 +19,8 @@ def download_dependencies():
     # Roborio Toolchain
     http_archive(
         name = "rules_bzlmodrio_toolchains",
-        sha256 = "1c566358f97b093916e150de10b65d6527ad268e5bd8bc0a0a8bfd04b390751a",
-        url = "https://github.com/bzlmodRio/rules_bzlmodRio_toolchains/releases/download/2023-7/rules_bzlmodRio_toolchains-2023-7.tar.gz",
+        sha256 = "cd3ff046427e9c6dbc0c86a458c8cf081b8045fc3fb4265d08c0ebfc17f9cb30",
+        url = "https://github.com/bzlmodRio/rules_bzlmodRio_toolchains/releases/download/2024-1/rules_bzlmodRio_toolchains-2024-1.tar.gz",
     )
 
     ########################

diff --git a/tests/.bazelrc b/tests/.bazelrc
@@ -9,6 +9,7 @@ build:windows --copt=/WX
 build:windows --copt=/std:c++20
 build:windows --copt=/Zc:preprocessor
 build:windows --copt=/wd5105
+build:windows --cxxopt=/wd4146
 build:windows --cxxopt=/wd4267
 build:windows --cxxopt=/wd4244
 
@@ -18,6 +19,7 @@ build:windows_arm --copt=/WX
 build:windows_arm --copt=/std:c++20
 build:windows_arm --copt=/Zc:preprocessor
 build:windows_arm --copt=/wd5105
+build:windows_arm --cxxopt=/wd4146
 build:windows_arm --cxxopt=/wd4267
 build:windows_arm --cxxopt=/wd4244
 build:windows_arm --cpu=x64_arm64_windows

diff --git a/tests/MODULE.bazel b/tests/MODULE.bazel
@@ -9,7 +9,7 @@ bazel_dep(name = "rules_cc", version = "0.0.8")
 bazel_dep(name = "rules_java", version = "6.4.0")
 bazel_dep(name = "rules_jvm_external", version = "5.3")
 bazel_dep(name = "rules_bazelrio", version = "0.0.13")
-bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2023-7")
+bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2024-1")
 bazel_dep(name = "rules_pmd", version = "6.43.0")
 bazel_dep(name = "rules_checkstyle", version = "10.1")
 bazel_dep(name = "rules_wpiformat", version = "2022.30")