Fixup

wpilibsuite · Dec 28, 2023 · 063647b · 063647b
1 parent e0dec5b
commit 063647b
Show file tree

Hide file tree

Showing 11 changed files with 1,743 additions and 28 deletions.
diff --git a/.bazelignore b/.bazelignore
@@ -1,2 +1,2 @@
-# tests
+tests
 generate
diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-7.0.0rc7
+7.0.0
diff --git a/.github/workflows/auto_update.yml b/.github/workflows/auto_update.yml
@@ -63,6 +63,10 @@ jobs:
           echo "Something changed, need to re-generate"
           bazel run //:generate
           buildifier -warnings all --lint=fix -r ..
+          cd ..
+          bazel build //... --nobuild --enable_bzlmod --lockfile_mode=update
+          cd tests
+          bazel build //... --nobuild --enable_bzlmod --lockfile_mode=update
         else
           echo "No changes!"
         fi;

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,11 +11,11 @@ jobs:
       fail-fast: false
       matrix:
         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 non-bzlmod, native
+        - { name: "windows - native",        os: windows-2022,   command: "test",   config: "--noenable_bzlmod --config=windows",     bazel_options: "--output_user_root=C:\\bazelroot", }
+        - { name: "windows arm - native",    os: windows-2022,   command: "build",  config: "--noenable_bzlmod --config=windows_arm", bazel_options: "--output_user_root=C:\\bazelroot", }
+        - { name: "ubuntu  - native",        os: ubuntu-latest,  command: "test",   config: "--noenable_bzlmod --config=linux",       bazel_options: "",                                 }
+        - { name: "macos   - native",        os: macos-latest,   command: "test",   config: "--noenable_bzlmod --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", }
@@ -42,10 +42,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        # Build standard, roborio
-        - { name: "windows - roborio",         os: windows-2022,   command: "build", config: "--config=roborio", bazel_options: "--output_user_root=C:\\bazelroot", }
-        - { name: "ubuntu  - roborio",         os: ubuntu-latest,  command: "build", config: "--config=roborio", bazel_options: "",                                 }
-        - { name: "macos   - roborio",         os: macos-latest,   command: "build", config: "--config=roborio", bazel_options: "",                                 }
+        # Build non-bzlmod, roborio
+        - { name: "windows - roborio",         os: windows-2022,   command: "build", config: "--noenable_bzlmod --config=roborio", bazel_options: "--output_user_root=C:\\bazelroot", }
+        - { name: "ubuntu  - roborio",         os: ubuntu-latest,  command: "build", config: "--noenable_bzlmod --config=roborio", bazel_options: "",                                 }
+        - { name: "macos   - roborio",         os: macos-latest,   command: "build", config: "--noenable_bzlmod --config=roborio", bazel_options: "",                                 }
 
         # Build bzlmod, roborio
       # - { 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:
       fail-fast: false
       matrix:
         include:
-        # Build standard, bullseye32
-        - { name: "windows - bullseye32",         os: windows-2022,   command: "build", config: "--config=bullseye32", bazel_options: "--output_user_root=C:\\bazelroot", }
-        - { name: "ubuntu  - bullseye32",         os: ubuntu-latest,  command: "build", config: "--config=bullseye32", bazel_options: "",                                 }
-        - { name: "macos   - bullseye32",         os: macos-latest,   command: "build", config: "--config=bullseye32", bazel_options: "",                                 }
+        # Build non-bzlmod, bullseye32
+        - { name: "windows - bullseye32",         os: windows-2022,   command: "build", config: "--noenable_bzlmod --config=bullseye32", bazel_options: "--output_user_root=C:\\bazelroot", }
+        - { name: "ubuntu  - bullseye32",         os: ubuntu-latest,  command: "build", config: "--noenable_bzlmod --config=bullseye32", bazel_options: "",                                 }
+        - { name: "macos   - bullseye32",         os: macos-latest,   command: "build", config: "--noenable_bzlmod --config=bullseye32", bazel_options: "",                                 }
 
         # Build bzlmod, bullseye32
         - { 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:
       fail-fast: false
       matrix:
         include:
-        # Build standard, bullseye32:
-        - { name: "windows - bullseye64",         os: windows-2022,   command: "build", config: "--config=bullseye64", bazel_options: "--output_user_root=C:\\bazelroot", }
-        - { name: "ubuntu  - bullseye64",         os: ubuntu-latest,  command: "build", config: "--config=bullseye64", bazel_options: "",                                 }
-        - { name: "macos   - bullseye64",         os: macos-latest,   command: "build", config: "--config=bullseye32", bazel_options: "",                                 }
+        # Build non-bzlmod, bullseye32:
+        - { name: "windows - bullseye64",         os: windows-2022,   command: "build", config: "--noenable_bzlmod --config=bullseye64", bazel_options: "--output_user_root=C:\\bazelroot", }
+        - { name: "ubuntu  - bullseye64",         os: ubuntu-latest,  command: "build", config: "--noenable_bzlmod --config=bullseye64", bazel_options: "",                                 }
+        - { name: "macos   - bullseye64",         os: macos-latest,   command: "build", config: "--noenable_bzlmod --config=bullseye32", bazel_options: "",                                 }
 
         # Build bzlmod, bullseye32:
         - { name: "windows - bzlmod bullseye64",  os: windows-2022,   command: "build", config: "--enable_bzlmod --config=bullseye64", bazel_options: "--output_user_root=C:\\bazelroot", }

diff --git a/MODULE.bazel b/MODULE.bazel
@@ -12,7 +12,12 @@ use_repo(deps, "roborio_jre")
 
 bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2024-1")
 
-REMOTE_JDK_REPOS = ["roboriojdk_linux", "roboriojdk_mac", "roboriojdk_win"]
+REMOTE_JDK_REPOS = [
+    "roboriojdk_linux",
+    "roboriojdk_mac",
+    "roboriojdk_win",
+]
+
 print(REMOTE_JDK_REPOS)
 
 [use_repo(
@@ -21,4 +26,4 @@ print(REMOTE_JDK_REPOS)
     repo + "_toolchain_config_repo",
 ) for repo in REMOTE_JDK_REPOS]
 
-[register_toolchains("@" + name + "_toolchain_config_repo//:all") for name in REMOTE_JDK_REPOS]
+[register_toolchains("@" + name + "_toolchain_config_repo//:all") for name in REMOTE_JDK_REPOS]
diff --git a/WORKSPACE b/WORKSPACE
@@ -1,15 +1,19 @@
 workspace(name = "rules_bzlmodrio_jdk")
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
 http_archive(
     name = "rules_java",
     urls = [
         "https://github.com/bazelbuild/rules_java/releases/download/7.1.0/rules_java-7.1.0.tar.gz",
     ],
     # sha256 = "27abf8d2b26f4572ba4112ae8eb4439513615018e03a299f85a8460f6992f6a3",
 )
+
 load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains")
+
 rules_java_dependencies()
+
 rules_java_toolchains()
 
 load("@rules_bzlmodrio_jdk//:maven_deps.bzl", "setup_legacy_setup_jdk_dependencies")
@@ -21,4 +25,3 @@ http_archive(
     sha256 = "cd3ff046427e9c6dbc0c86a458c8cf081b8045fc3fb4265d08c0ebfc17f9cb30",
     url = "https://github.com/bzlmodRio/rules_bzlmodRio_toolchains/releases/download/2024-1/rules_bzlmodRio_toolchains-2024-1.tar.gz",
 )
-
diff --git a/generate/.bazelversion b/generate/.bazelversion
@@ -0,0 +1 @@
+7.0.0
diff --git a/generate/MODULE.bazel b/generate/MODULE.bazel
@@ -0,0 +1,5 @@
+bazel_dep(name = "bzlmodrio-gentool", version = "")
+local_path_override(
+    module_name = "bzlmodrio-gentool",
+    path = "../../../gentool",
+)