Update to 17.0.12+7 (#9)

wpilibsuite · Dec 7, 2024 · 7e3b33b · 7e3b33b
1 parent b3d0ce2
commit 7e3b33b
Show file tree

Hide file tree

Showing 13 changed files with 160 additions and 57 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-bullseye
+build:bookworm32 --platform_suffix=bookworm32
+
+# bookworm64
+build:bookworm64 --platforms=@rules_bzlmodrio_toolchains//platforms/bookworm64
+build:bookworm64 --build_tag_filters=-no-bullseye
+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/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -0,0 +1,33 @@
+name: Publish Module
+on:
+  workflow_dispatch:
+  push:
+    tags:
+    - '*'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  publish_module:
+    name: "Publish Module"
+    runs-on: ubuntu-22.04
+    steps:
+    # Checkout repository
+    - uses: actions/checkout@v4
+      with:
+        path: rules/rules_bzlmodrio_jdk
+
+    - name: Create Archive
+      run: git archive HEAD --format=tar.gz --output="rules_bzlmodrio_jdk-${GITHUB_REF_NAME}.tar.gz"
+      working-directory: rules/rules_bzlmodrio_jdk
+
+    - name: Setup archive name
+      run: echo "ARCHIVE_NAME=rules/rules_bzlmodrio_jdk/rules_bzlmodrio_jdk-${GITHUB_REF_NAME}.tar.gz" >> "$GITHUB_ENV"
+
+    - name: Release
+      uses: softprops/action-gh-release@v2
+      if: startsWith(github.ref, 'refs/tags/')
+      with:
+        files: "${{ env.ARCHIVE_NAME }}"
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -1,6 +1,6 @@
 module(
     name = "rules_bzlmodrio_jdk",
-    version = "17.0.8.1-1",
+    version = "17.0.12-7",
     compatibility_level = 2024,
 )
 
@@ -9,7 +9,7 @@ bazel_dep(name = "rules_java", version = "7.6.5")
 
 deps = use_extension("//:maven_deps.bzl", "deps")
 
-bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2024-1")
+bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2025-1")
 
 REMOTE_JDK_REPOS = [
     "roboriojdk_linux",

diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
diff --git a/maven_deps.bzl b/maven_deps.bzl
@@ -9,9 +9,9 @@ def __setup_jdk_dependencies(mctx):
             "@platforms//os:linux",
             "@platforms//cpu:x86_64",
         ],
-        sha256 = "c25dfbc334068a48c19c44ce39ad4b8427e309ae1cfa83f23c102e78b8a6dcc0",
-        urls = ["https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1%2B1/OpenJDK17U-jdk_x64_linux_hotspot_17.0.8.1_1.tar.gz"],
-        strip_prefix = "jdk-17.0.8.1+1",
+        sha256 = "9d4dd339bf7e6a9dcba8347661603b74c61ab2a5083ae67bf76da6285da8a778",
+        urls = ["https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.12_7.tar.gz"],
+        strip_prefix = "jdk-17.0.12+7",
     )
 
     remote_java_repository(
@@ -22,9 +22,9 @@ def __setup_jdk_dependencies(mctx):
             "@platforms//os:linux",
             "@platforms//cpu:armv7",
         ],
-        sha256 = "eefd3cf3b3dd47ff269fa5b5c10b5e096b163f4e9c1810023abdbc00dc6cc304",
-        urls = ["https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1%2B1/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.8.1_1.tar.gz"],
-        strip_prefix = "jdk-17.0.8.1+1",
+        sha256 = "8257de06bf37f0c8f19f8d542e2ab5a4e17db3ca5f29d041bd0b02ab265db021",
+        urls = ["https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.12_7.tar.gz"],
+        strip_prefix = "jdk-17.0.12+7",
     )
 
     remote_java_repository(
@@ -35,9 +35,9 @@ def __setup_jdk_dependencies(mctx):
             "@platforms//os:macos",
             "@platforms//cpu:x86_64",
         ],
-        sha256 = "18be56732c1692ef131625d814dcb02ee091a43fdd6f214a33d87cc14842fc3f",
-        urls = ["https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1%2B1/OpenJDK17U-jdk_x64_mac_hotspot_17.0.8.1_1.tar.gz"],
-        strip_prefix = "jdk-17.0.8.1+1/Contents/Home",
+        sha256 = "d5230eeec88739aa7133e4c8635bbd4ab226708c12deaafa13cf26b02bc8e8c4",
+        urls = ["https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_mac_hotspot_17.0.12_7.tar.gz"],
+        strip_prefix = "jdk-17.0.12+7/Contents/Home",
     )
 
     remote_java_repository(
@@ -48,9 +48,9 @@ def __setup_jdk_dependencies(mctx):
             "@platforms//os:macos",
             "@platforms//cpu:aarch64",
         ],
-        sha256 = "2e95eed48650f00650e963c8213b6c6ecda54458edf8d254ebc99d6a6966ffad",
-        urls = ["https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1%2B1/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.8.1_1.tar.gz"],
-        strip_prefix = "jdk-17.0.8.1+1/Contents/Home",
+        sha256 = "d7910b1acaeb290c5c5da21811d2b2b8635f806612a2d6e8d1953b2f77580f78",
+        urls = ["https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.12_7.tar.gz"],
+        strip_prefix = "jdk-17.0.12+7/Contents/Home",
     )
 
     remote_java_repository(
@@ -61,9 +61,9 @@ def __setup_jdk_dependencies(mctx):
             "@platforms//os:windows",
             # Assume JDK works for any CPU,
         ],
-        sha256 = "651a795155dc918c06cc9fd4b37253b9cbbca5ec8e76d4a8fa7cdaeb1f52761c",
-        urls = ["https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1%2B1/OpenJDK17U-jdk_x64_windows_hotspot_17.0.8.1_1.zip"],
-        strip_prefix = "jdk-17.0.8.1+1",
+        sha256 = "052049d687ebfda6a4032d54afcd0da6549a23bc2ed04cfaa509746eeacbae71",
+        urls = ["https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_windows_hotspot_17.0.12_7.zip"],
+        strip_prefix = "jdk-17.0.12+7",
     )
 
 def setup_legacy_setup_jdk_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-bullseye
+build:bookworm32 --platform_suffix=bookworm32
+
+# bookworm64
+build:bookworm64 --platforms=@rules_bzlmodrio_toolchains//platforms/bookworm64
+build:bookworm64 --build_tag_filters=-no-bullseye
+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
@@ -6,12 +6,12 @@ local_path_override(
 
 bazel_dep(name = "rules_java", version = "7.6.5")
 bazel_dep(name = "rules_jvm_external", version = "6.1")
-bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2024-1")
+bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2025-1")
 bazel_dep(name = "rules_checkstyle", version = "10.12.2")
 bazel_dep(name = "rules_pmd", version = "7.2.0")
 bazel_dep(name = "rules_spotless", version = "2.40.0")
-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")
 
 maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
 maven.install(