From 845011332a2f01b1a5c8eedab411fa3b4568c727 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Fri, 6 Dec 2024 20:58:02 -0500 Subject: [PATCH] Regenerate --- .bazelrc | 10 ++++ .bazelrc-cc | 10 ++++ .clang-format | 5 ++ .github/workflows/build.yml | 6 +-- .github/workflows/publish.yml | 49 +++++++++++++++++++ MODULE.bazel | 2 +- .../download_dependencies.bzl | 4 +- tests/.bazelrc | 10 ++++ tests/.bazelrc-cc | 10 ++++ tests/MODULE.bazel | 6 +-- tests/WORKSPACE | 4 +- 11 files changed, 105 insertions(+), 11 deletions(-) create mode 100644 .clang-format diff --git a/.bazelrc b/.bazelrc index 5a940c3..0c34149 100644 --- 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 index 7ca7094..cfbe70b 100644 --- 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 new file mode 100644 index 0000000..d706825 --- /dev/null +++ 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 index be594cc..b074546 100644 --- 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 index 126d262..b6473eb 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -31,3 +31,52 @@ jobs: if: startsWith(github.ref, 'refs/tags/') with: files: "${{ env.ARCHIVE_NAME }}" + + + # Checkout gentool + - uses: actions/checkout@v4 + with: + repository: 'bzlmodRio/gentool.git' + fetch-depth: 0 + path: gentool + ref: refactor_dev + + # Checkout BCR + - uses: actions/checkout@v4 + with: + repository: 'bzlmodRio/bazel-central-registry.git' + fetch-depth: 0 + path: bazel-central-registry + ref: bzlmodrio + + # Run publishing + - run: bazel run //:publish + working-directory: libraries/bzlmodrio-ni/generate + + - name: Store version + run: echo "NEW_VERSION=$(bazel run //:get_version)" >> $GITHUB_ENV + working-directory: libraries/bzlmodrio-ni/generate + + + # Create pull requests + - name: Create Gentool Pull Request + uses: peter-evans/create-pull-request@v6 + env: + GITHUB_TOKEN: ${{ secrets.AUTO_UPDATE_KEY }} + with: + path: gentool + base: refactor_dev + token: ${{ secrets.AUTO_UPDATE_KEY }} + branch: autoupdate/bzlmodrio-ni_update_${{ env.NEW_VERSION }} + title: "Auto Update bzlmodrio-ni module to '${{ env.NEW_VERSION }}'" + + - name: Create BCR Pull Request + uses: peter-evans/create-pull-request@v6 + env: + GITHUB_TOKEN: ${{ secrets.AUTO_UPDATE_KEY }} + with: + path: bazel-central-registry + base: bzlmodrio + token: ${{ secrets.AUTO_UPDATE_KEY }} + branch: autoupdate/bzlmodrio-ni_update_${{ env.NEW_VERSION }} + title: "Auto Update latest bzlmodrio-ni to '${{ env.NEW_VERSION }}'" diff --git a/MODULE.bazel b/MODULE.bazel index 5c6d9ef..51f3ca4 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -7,7 +7,7 @@ module( 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 index f106a43..60feb24 100644 --- 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 = None, + url = "https://github.com/wpilibsuite/rules_bzlmodRio_toolchains/releases/download/2025-1/rules_bzlmodRio_toolchains-2025-1.tar.gz", ) ######################## diff --git a/tests/.bazelrc b/tests/.bazelrc index 5a940c3..0c34149 100644 --- 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 index 7ca7094..cfbe70b 100644 --- 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 index 4d57796..8c68e01 100644 --- 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 index 857f35c..df14060 100644 --- 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")