Skip to content

Commit 063647b

Browse files
pjreinigerpjreiniger
committed
Fixup
1 parent e0dec5b commit 063647b

File tree

11 files changed

+1743
-28
lines changed

11 files changed

+1743
-28
lines changed

‎.bazelignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
# tests
1+
tests
22
generate

‎.bazelversion‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.0.0rc7
1+
7.0.0

‎.github/workflows/auto_update.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@ jobs:
6363
echo "Something changed, need to re-generate"
6464
bazel run //:generate
6565
buildifier -warnings all --lint=fix -r ..
66+
cd ..
67+
bazel build //... --nobuild --enable_bzlmod --lockfile_mode=update
68+
cd tests
69+
bazel build //... --nobuild --enable_bzlmod --lockfile_mode=update
6670
else
6771
echo "No changes!"
6872
fi;

‎.github/workflows/build.yml‎

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

2020
# Build bzlmod, native
2121
- { name: "windows - bzlmod native", os: windows-2022, command: "test", config: "--enable_bzlmod --config=windows", bazel_options: "--output_user_root=C:\\bazelroot", }
@@ -42,10 +42,10 @@ jobs:
4242
fail-fast: false
4343
matrix:
4444
include:
45-
# Build standard, roborio
46-
- { name: "windows - roborio", os: windows-2022, command: "build", config: "--config=roborio", bazel_options: "--output_user_root=C:\\bazelroot", }
47-
- { name: "ubuntu - roborio", os: ubuntu-latest, command: "build", config: "--config=roborio", bazel_options: "", }
48-
- { name: "macos - roborio", os: macos-latest, command: "build", config: "--config=roborio", bazel_options: "", }
45+
# Build non-bzlmod, roborio
46+
- { name: "windows - roborio", os: windows-2022, command: "build", config: "--noenable_bzlmod --config=roborio", bazel_options: "--output_user_root=C:\\bazelroot", }
47+
- { name: "ubuntu - roborio", os: ubuntu-latest, command: "build", config: "--noenable_bzlmod --config=roborio", bazel_options: "", }
48+
- { name: "macos - roborio", os: macos-latest, command: "build", config: "--noenable_bzlmod --config=roborio", bazel_options: "", }
4949

5050
# Build bzlmod, roborio
5151
# - { name: "windows - bzlmod roborio", os: windows-2022, command: "build", config: "--enable_bzlmod --config=roborio", bazel_options: "--output_user_root=C:\\bazelroot", }
@@ -68,10 +68,10 @@ jobs:
6868
fail-fast: false
6969
matrix:
7070
include:
71-
# Build standard, bullseye32
72-
- { name: "windows - bullseye32", os: windows-2022, command: "build", config: "--config=bullseye32", bazel_options: "--output_user_root=C:\\bazelroot", }
73-
- { name: "ubuntu - bullseye32", os: ubuntu-latest, command: "build", config: "--config=bullseye32", bazel_options: "", }
74-
- { name: "macos - bullseye32", os: macos-latest, command: "build", config: "--config=bullseye32", bazel_options: "", }
71+
# Build non-bzlmod, bullseye32
72+
- { name: "windows - bullseye32", os: windows-2022, command: "build", config: "--noenable_bzlmod --config=bullseye32", bazel_options: "--output_user_root=C:\\bazelroot", }
73+
- { name: "ubuntu - bullseye32", os: ubuntu-latest, command: "build", config: "--noenable_bzlmod --config=bullseye32", bazel_options: "", }
74+
- { name: "macos - bullseye32", os: macos-latest, command: "build", config: "--noenable_bzlmod --config=bullseye32", bazel_options: "", }
7575

7676
# Build bzlmod, bullseye32
7777
- { name: "windows - bzlmod bullseye32", os: windows-2022, command: "build", config: "--enable_bzlmod --config=bullseye32", bazel_options: "--output_user_root=C:\\bazelroot", }
@@ -95,10 +95,10 @@ jobs:
9595
fail-fast: false
9696
matrix:
9797
include:
98-
# Build standard, bullseye32:
99-
- { name: "windows - bullseye64", os: windows-2022, command: "build", config: "--config=bullseye64", bazel_options: "--output_user_root=C:\\bazelroot", }
100-
- { name: "ubuntu - bullseye64", os: ubuntu-latest, command: "build", config: "--config=bullseye64", bazel_options: "", }
101-
- { name: "macos - bullseye64", os: macos-latest, command: "build", config: "--config=bullseye32", bazel_options: "", }
98+
# Build non-bzlmod, bullseye32:
99+
- { name: "windows - bullseye64", os: windows-2022, command: "build", config: "--noenable_bzlmod --config=bullseye64", bazel_options: "--output_user_root=C:\\bazelroot", }
100+
- { name: "ubuntu - bullseye64", os: ubuntu-latest, command: "build", config: "--noenable_bzlmod --config=bullseye64", bazel_options: "", }
101+
- { name: "macos - bullseye64", os: macos-latest, command: "build", config: "--noenable_bzlmod --config=bullseye32", bazel_options: "", }
102102

103103
# Build bzlmod, bullseye32:
104104
- { name: "windows - bzlmod bullseye64", os: windows-2022, command: "build", config: "--enable_bzlmod --config=bullseye64", bazel_options: "--output_user_root=C:\\bazelroot", }

‎MODULE.bazel‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,12 @@ use_repo(deps, "roborio_jre")
1212

1313
bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2024-1")
1414

15-
REMOTE_JDK_REPOS = ["roboriojdk_linux", "roboriojdk_mac", "roboriojdk_win"]
15+
REMOTE_JDK_REPOS = [
16+
"roboriojdk_linux",
17+
"roboriojdk_mac",
18+
"roboriojdk_win",
19+
]
20+
1621
print(REMOTE_JDK_REPOS)
1722

1823
[use_repo(
@@ -21,4 +26,4 @@ print(REMOTE_JDK_REPOS)
2126
repo + "_toolchain_config_repo",
2227
) for repo in REMOTE_JDK_REPOS]
2328

24-
[register_toolchains("@" + name + "_toolchain_config_repo//:all") for name in REMOTE_JDK_REPOS]
29+
[register_toolchains("@" + name + "_toolchain_config_repo//:all") for name in REMOTE_JDK_REPOS]

‎WORKSPACE‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
workspace(name = "rules_bzlmodrio_jdk")
22

33
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
4+
45
http_archive(
56
name = "rules_java",
67
urls = [
78
"https://github.com/bazelbuild/rules_java/releases/download/7.1.0/rules_java-7.1.0.tar.gz",
89
],
910
# sha256 = "27abf8d2b26f4572ba4112ae8eb4439513615018e03a299f85a8460f6992f6a3",
1011
)
12+
1113
load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains")
14+
1215
rules_java_dependencies()
16+
1317
rules_java_toolchains()
1418

1519
load("@rules_bzlmodrio_jdk//:maven_deps.bzl", "setup_legacy_setup_jdk_dependencies")
@@ -21,4 +25,3 @@ http_archive(
2125
sha256 = "cd3ff046427e9c6dbc0c86a458c8cf081b8045fc3fb4265d08c0ebfc17f9cb30",
2226
url = "https://github.com/bzlmodRio/rules_bzlmodRio_toolchains/releases/download/2024-1/rules_bzlmodRio_toolchains-2024-1.tar.gz",
2327
)
24-

‎generate/.bazelversion‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
7.0.0

‎generate/MODULE.bazel‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
bazel_dep(name = "bzlmodrio-gentool", version = "")
2+
local_path_override(
3+
module_name = "bzlmodrio-gentool",
4+
path = "../../../gentool",
5+
)

0 commit comments

Comments
 (0)