bzlmod-ify generation (#13)

wpilibsuite · Dec 13, 2023 · 3a31939 · 3a31939
1 parent f25ecb6
commit 3a31939
Show file tree

Hide file tree

Showing 8 changed files with 2,331 additions and 19 deletions.
diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-6.3.2
+6.4.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/generate/.bazelversion b/generate/.bazelversion
@@ -0,0 +1 @@
+6.4.0
diff --git a/generate/MODULE.bazel b/generate/MODULE.bazel
@@ -0,0 +1,10 @@
+module(
+    name = "bzlmodrio-opencv-gentool",
+)
+
+bazel_dep(name = "rules_python", version = "0.21.0")
+bazel_dep(name = "bzlmodrio-gentool", version = "")
+local_path_override(
+    module_name = "bzlmodrio-gentool",
+    path = "../../../gentool",
+)