Skip to content

Commit d318540

Browse files
pjreinigerpjreiniger
committed
Update to bazel 8, remove styleguide
1 parent 3bb560a commit d318540

21 files changed

Lines changed: 420 additions & 1675 deletions

‎.bazelrc‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ import .bazelrc-cc
55
import .bazelrc-java
66
import .bazelrc-buildbuddy
77

8-
build --incompatible_disallow_empty_glob=1 # Bazel 8 prep
9-
108
build --test_env=LD_LIBRARY_PATH=.
119
build --test_env=DYLD_LIBRARY_PATH=.
1210

‎.bazelrc-buildbuddy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ build:build_buddy --remote_cache=grpcs://remote.buildbuddy.io
77
build:build_buddy --remote_timeout=3600
88

99
# Additional suggestions from buildbuddy for speed
10-
build:build_buddy --experimental_remote_cache_compression
10+
build:build_buddy --remote_cache_compression
1111
build:build_buddy --experimental_remote_cache_compression_threshold=100
1212
build:build_buddy --noslim_profile
1313
build:build_buddy --experimental_profile_include_target_label

‎.bazelrc-cc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ build:windows_arm --cxxopt=/wd4146
1919
build:windows_arm --cxxopt=/wd4267
2020
build:windows_arm --cxxopt=/wd4244
2121
build:windows_arm --cxxopt=/utf-8
22-
build:windows_arm --cpu=arm64_windows
22+
build:windows_arm --platforms="@rules_bzlmodrio_toolchains//platforms/windows_arm64"
23+
build:windows_arm --platform_suffix=windowsarm64
2324

2425
# Linux
2526
build:linux --copt=-Wall

‎.bazelversion‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.3.1
1+
8.2.1

‎.github/workflows/build.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ jobs:
1212
matrix:
1313
include:
1414
# Build non-bzlmod, native
15-
- { name: "windows - native", os: windows-2022, java_arch: "x64", command: "test", config: "--noenable_bzlmod --config=windows", bazel_options: "--output_user_root=C:\\bazelroot", }
16-
- { name: "windows arm - native", os: windows-2022, java_arch: "x64", command: "build", config: "--noenable_bzlmod --config=windows_arm", bazel_options: "--output_user_root=C:\\bazelroot", }
17-
- { name: "ubuntu - native", os: ubuntu-22.04, java_arch: "x64", command: "test", config: "--noenable_bzlmod --config=linux", bazel_options: "", }
18-
- { name: "macos - native", os: macos-14, java_arch: "aarch64", command: "test", config: "--noenable_bzlmod --config=macos", bazel_options: "", }
15+
- { name: "windows - native", os: windows-2022, java_arch: "x64", command: "test", config: "--noenable_bzlmod --enable_workspace --config=windows", bazel_options: "--output_user_root=C:\\bazelroot", }
16+
- { name: "windows arm - native", os: windows-11-arm, java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --enable_workspace --config=windows_arm", bazel_options: "--output_user_root=C:\\bazelroot", }
17+
- { name: "ubuntu - native", os: ubuntu-22.04, java_arch: "x64", command: "test", config: "--noenable_bzlmod --enable_workspace --config=linux", bazel_options: "", }
18+
- { name: "macos - native", os: macos-14, java_arch: "aarch64", command: "test", config: "--noenable_bzlmod --enable_workspace --config=macos", bazel_options: "", }
1919

2020
# Build bzlmod, native
2121
- { name: "windows - bzlmod native", os: windows-2022, java_arch: "x64", command: "test", config: "--enable_bzlmod --config=windows", bazel_options: "--output_user_root=C:\\bazelroot", }
22-
- { name: "windows arm - bzlmod native", os: windows-2022, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=windows_arm", bazel_options: "--output_user_root=C:\\bazelroot", }
22+
- { name: "windows arm - bzlmod native", os: windows-11-arm, java_arch: "aarch64", command: "build", config: "--enable_bzlmod --config=windows_arm", bazel_options: "--output_user_root=C:\\bazelroot", }
2323
- { name: "ubuntu - bzlmod native", os: ubuntu-22.04, java_arch: "x64", command: "test", config: "--enable_bzlmod --config=linux", bazel_options: "", }
2424
- { name: "macos - bzlmod native", os: macos-14, java_arch: "aarch64", command: "test", config: "--enable_bzlmod --config=macos", bazel_options: "", }
2525

@@ -54,9 +54,9 @@ jobs:
5454
matrix:
5555
include:
5656
# Build non-bzlmod, roborio
57-
- { name: "windows - roborio", os: windows-2022, java_arch: "x64", command: "build", config: "--noenable_bzlmod --config=roborio", bazel_options: "--output_user_root=C:\\bazelroot", }
58-
- { name: "ubuntu - roborio", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--noenable_bzlmod --config=roborio", bazel_options: "", }
59-
- { name: "macos - roborio", os: macos-14, java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --config=roborio", bazel_options: "", }
57+
- { name: "windows - roborio", os: windows-2022, java_arch: "x64", command: "build", config: "--noenable_bzlmod --enable_workspace --config=roborio", bazel_options: "--output_user_root=C:\\bazelroot", }
58+
- { name: "ubuntu - roborio", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--noenable_bzlmod --enable_workspace --config=roborio", bazel_options: "", }
59+
- { name: "macos - roborio", os: macos-14, java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --enable_workspace --config=roborio", bazel_options: "", }
6060

6161
# Build bzlmod, roborio
6262
# - { name: "windows - bzlmod roborio", os: windows-2022, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=roborio", bazel_options: "--output_user_root=C:\\bazelroot", }
@@ -90,9 +90,9 @@ jobs:
9090
matrix:
9191
include:
9292
# Build non-bzlmod, linuxarm32
93-
- { name: "windows - linuxarm32", os: windows-2022, java_arch: "x64", command: "build", config: "--noenable_bzlmod --config=linuxarm32", bazel_options: "--output_user_root=C:\\bazelroot", }
94-
- { name: "ubuntu - linuxarm32", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--noenable_bzlmod --config=linuxarm32", bazel_options: "", }
95-
- { name: "macos - linuxarm32", os: macos-14, java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --config=linuxarm32", bazel_options: "", }
93+
- { name: "windows - linuxarm32", os: windows-2022, java_arch: "x64", command: "build", config: "--noenable_bzlmod --enable_workspace --config=linuxarm32", bazel_options: "--output_user_root=C:\\bazelroot", }
94+
- { name: "ubuntu - linuxarm32", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--noenable_bzlmod --enable_workspace --config=linuxarm32", bazel_options: "", }
95+
- { name: "macos - linuxarm32", os: macos-14, java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --enable_workspace --config=linuxarm32", bazel_options: "", }
9696

9797
# Build bzlmod, linuxarm32
9898
# - { name: "windows - bzlmod linuxarm32", os: windows-2022, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=linuxarm32", bazel_options: "--output_user_root=C:\\bazelroot", }
@@ -126,9 +126,9 @@ jobs:
126126
matrix:
127127
include:
128128
# Build non-bzlmod, linuxarm64
129-
- { name: "windows - linuxarm64", os: windows-2022, java_arch: "x64", command: "build", config: "--noenable_bzlmod --config=linuxarm64", bazel_options: "--output_user_root=C:\\bazelroot", }
130-
- { name: "ubuntu - linuxarm64", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--noenable_bzlmod --config=linuxarm64", bazel_options: "", }
131-
- { name: "macos - linuxarm64", os: macos-14, java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --config=linuxarm64", bazel_options: "", }
129+
- { name: "windows - linuxarm64", os: windows-2022, java_arch: "x64", command: "build", config: "--noenable_bzlmod --enable_workspace --config=linuxarm64", bazel_options: "--output_user_root=C:\\bazelroot", }
130+
- { name: "ubuntu - linuxarm64", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--noenable_bzlmod --enable_workspace --config=linuxarm64", bazel_options: "", }
131+
- { name: "macos - linuxarm64", os: macos-14, java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --enable_workspace --config=linuxarm64", bazel_options: "", }
132132

133133
# Build bzlmod, linuxarm64
134134
- { name: "windows - bzlmod linuxarm64", os: windows-2022, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=linuxarm64", bazel_options: "--output_user_root=C:\\bazelroot", }

‎.github/workflows/lint.yml‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,6 @@ jobs:
88
steps:
99
- uses: actions/checkout@v4
1010
- uses: psf/black@stable
11-
wpiformat:
12-
name: "wpiformat"
13-
runs-on: ubuntu-22.04
14-
steps:
15-
- uses: actions/checkout@v4
16-
with:
17-
fetch-depth: 0
18-
- name: Fetch main
19-
run: |
20-
git branch -f main origin/main
21-
if: github.ref != 'refs/heads/main'
22-
- uses: actions/setup-python@v5
23-
with: { python-version: '3.11' }
24-
- name: Install clang-format
25-
run: |
26-
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
27-
sudo sh -c "echo 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-14 main' >> /etc/apt/sources.list.d/proposed-repositories.list"
28-
sudo apt-get update -q
29-
sudo apt-get install -y clang-format-14
30-
- run: bazel run --noenable_bzlmod @rules_wpiformat//wpiformat -- -f ..
31-
working-directory: tests
32-
if: github.ref != 'refs/heads/main'
33-
34-
- name: Check Output
35-
run: git --no-pager diff --exit-code HEAD
3611
buildifier:
3712
name: "buildifier"
3813
runs-on: ubuntu-22.04

‎.styleguide-license‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-

‎MODULE.bazel‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
module(
22
name = "bzlmodrio-libssh",
3-
version = "2024.0.105-1",
3+
version = "2024.0.105-1.bcr1",
44
compatibility_level = 2024,
55
)
66

77
bazel_dep(name = "platforms", version = "0.0.9")
8-
bazel_dep(name = "rules_cc", version = "0.0.9")
9-
bazel_dep(name = "rules_java", version = "7.6.5")
8+
bazel_dep(name = "rules_cc", version = "0.1.1")
9+
bazel_dep(name = "rules_java", version = "8.11.0")
1010
bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2025-1.bcr4")
1111

1212
setup_bzlmodrio_libssh_cpp_dependencies = use_extension("//:maven_cpp_deps.bzl", "setup_bzlmodrio_libssh_cpp_dependencies")

‎README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-

‎WORKSPACE‎

Lines changed: 49 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,71 @@
11
workspace(name = "bzlmodrio-libssh")
22

3-
load("@bzlmodrio-libssh//private/non_bzlmod_dependencies:download_dependencies.bzl", "download_dependencies")
4-
5-
download_dependencies()
6-
7-
load("@bazel_features//:deps.bzl", "bazel_features_deps")
3+
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
4+
5+
########################
6+
# Download Dependencies
7+
########################
8+
http_archive(
9+
name = "rules_java",
10+
sha256 = "d31b6c69e479ffa45460b64dc9c7792a431cac721ef8d5219fc9f603fa2ff877",
11+
url = "https://github.com/bazelbuild/rules_java/releases/download/8.11.0/rules_java-8.11.0.tar.gz",
12+
)
813

9-
bazel_features_deps()
14+
http_archive(
15+
name = "rules_jvm_external",
16+
sha256 = "c18a69d784bcd851be95897ca0eca0b57dc86bb02e62402f15736df44160eb02",
17+
strip_prefix = "rules_jvm_external-6.3",
18+
url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/6.3/rules_jvm_external-6.3.tar.gz",
19+
)
1020

11-
load("@rules_cc//cc:repositories.bzl", "rules_cc_toolchains")
21+
http_archive(
22+
name = "rules_python",
23+
sha256 = "690e0141724abb568267e003c7b6d9a54925df40c275a870a4d934161dc9dd53",
24+
strip_prefix = "rules_python-0.40.0",
25+
url = "https://github.com/bazelbuild/rules_python/releases/download/0.40.0/rules_python-0.40.0.tar.gz",
26+
)
1227

13-
rules_cc_toolchains()
28+
http_archive(
29+
name = "com_google_protobuf",
30+
sha256 = "10a0d58f39a1a909e95e00e8ba0b5b1dc64d02997f741151953a2b3659f6e78c",
31+
strip_prefix = "protobuf-29.0",
32+
urls = ["https://github.com/protocolbuffers/protobuf/archive/v29.0.tar.gz"],
33+
)
1434

15-
load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")
35+
http_archive(
36+
name = "rules_bazelrio",
37+
sha256 = "0c5a98476ac5b606689863b7b9ef3f7d685c47ce2681e448ca977e8e95de31c1",
38+
url = "https://github.com/bzlmodRio/rules_bazelrio/releases/download/0.0.14/rules_bazelrio-0.0.14.tar.gz",
39+
)
1640

17-
rules_java_dependencies()
41+
http_archive(
42+
name = "rules_bzlmodrio_toolchains",
43+
sha256 = "37780b3d3f30de72aaca12d9f80edc4216f6d708bed5b261c424d4dde49e8531",
44+
url = "https://github.com/wpilibsuite/rules_bzlmodRio_toolchains/releases/download/2025-1.bcr4/rules_bzlmodRio_toolchains-2025-1.bcr4.tar.gz",
45+
)
1846

19-
# note that the following line is what is minimally required from protobuf for the java rules
20-
# consider using the protobuf_deps() public API from @com_google_protobuf//:protobuf_deps.bzl
21-
load("@com_google_protobuf//bazel/private:proto_bazel_features.bzl", "proto_bazel_features") # buildifier: disable=bzl-visibility
47+
########################
2248

23-
proto_bazel_features(name = "proto_bazel_features")
49+
########################
50+
# Setup Dependencies
51+
########################
2452

25-
# register toolchains
26-
load("@rules_java//java:repositories.bzl", "rules_java_toolchains")
53+
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
2754

28-
rules_java_toolchains()
55+
protobuf_deps()
2956

30-
load("@rules_jvm_external//:repositories.bzl", "rules_jvm_external_deps")
57+
load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")
3158

32-
rules_jvm_external_deps()
59+
rules_java_dependencies()
3360

34-
load("@rules_jvm_external//:setup.bzl", "rules_jvm_external_setup")
61+
load("@rules_java//java:repositories.bzl", "rules_java_toolchains")
3562

36-
rules_jvm_external_setup()
63+
rules_java_toolchains()
3764

3865
load("@bzlmodrio-libssh//private/non_bzlmod_dependencies:setup_dependencies.bzl", "setup_dependencies")
3966

4067
setup_dependencies()
68+
########################
4169

4270
load("@rules_jvm_external//:defs.bzl", "maven_install")
4371

0 commit comments

Comments
 (0)