workflow update and formatting

Author: Felix Hilgers

MODULE.bazel

@@ -14,6 +14,23 @@ bazel_dep(name = "rules_android", version = "0.2.0")
 bazel_dep(name = "rules_buildbuddy", version = "0.0.1")
 bazel_dep(name = "rules_robolectric", version = "4.11.1")
 bazel_dep(name = "rules_android_ndk", version = "0.1.0")
+bazel_dep(name = "aspect_rules_py", version = "0.7.3")
+bazel_dep(name = "rules_python", version = "0.32.2")
+
+python = use_extension("@rules_python//python/extensions:python.bzl", "python")
+python.toolchain(
+    python_version = "3.12",
+)
+use_repo(python, "python_versions")
+
+pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip")
+pip.parse(
+    hub_name = "pip_tool_deps",
+    python_version = "3.12",
+    requirements_lock = "//tools:requirements.txt",
+)
+use_repo(pip, "pip_tool_deps")
+
 git_override(
     module_name = "rules_android_ndk",
     commit = "1ed5be3498d20c8120417fe73b6a5f2b4a3438cc",

MODULE.bazel.lock

@@ -11,5 +11,5 @@ actions:
     resource_requests:
       disk: 50G
     bazel_commands:
-      - "bazel run //tools/workflow:workflow_setup"
+      - "bazel run //tools:workflow_setup"
       - "bazel --bazelrc=ci.bazelrc test //..."

buildbuddy.yaml

@@ -69,42 +69,8 @@
             pkgs.static-web-server
             pkgs.bazel-buildtools
             pkgs.act
-            (pkgs.buildFHSEnv {
-              name = "ibazel";
-              targetPkgs = pkgs: (with pkgs; [zlib.dev libxcrypt bazel_7 bazel-watcher stdenv.cc openjdk11 python3 unzip zip]);
-              runScript = "ibazel";
-              unsharePid = false;
-              unshareUser = false;
-              unshareIpc = false;
-              unshareNet = false;
-              unshareUts = false;
-              unshareCgroup = false;
-            })
-            (pkgs.buildFHSEnv {
-              name = "dummy";
-              targetPkgs = pkgs: (with pkgs; [zlib.dev libxcrypt bazel_7 stdenv.cc openjdk11 python3 unzip pandoc zip bazelisk libcxxabi.dev glibc]);
-              runScript = "bash";
-              unsharePid = false;
-              unshareUser = false;
-              unshareIpc = false;
-              unshareNet = false;
-              unshareUts = false;
-              unshareCgroup = false;
-            })
             (pkgs.buildFHSEnv {
               name = "bazel";
-              targetPkgs = pkgs: (with pkgs; [zlib.dev libxcrypt bazel_7 stdenv.cc openjdk11 python3 unzip pandoc zip bazelisk libcxxabi.dev]);
-              runScript = "/home/flyxi/.cache/bazelisk/downloads/sha256/0a96c4f0a121417e0aad666a3a3a1ef1d72de388463f9f4ddbb496b52e1a0232/bin/bazel";
-              multiPkgs = pkgs: (with pkgs; [glibc]);
-              unsharePid = false;
-              unshareUser = false;
-              unshareIpc = false;
-              unshareNet = false;
-              unshareUts = false;
-              unshareCgroup = false;
-            })
-            (pkgs.buildFHSEnv {
-              name = "bazelisk";
               targetPkgs = pkgs: (with pkgs; [zlib.dev libxcrypt bazel_7 stdenv.cc openjdk11 python3 unzip pandoc zip bazelisk android-tools]);
               runScript = "bazelisk";
               unsharePid = false;
@@ -141,21 +107,16 @@
           programs = {
             alejandra.enable = true;
             rustfmt.enable = true;
-            prettier = {
+            biome.enable = true;
+            ruff.enable = true;
+            shfmt.enable = true;
+            buildifier = {
               enable = true;
+              includes = ["BUILD" "WORKSPACE" "MODULE" "*.bzl" "*.bazel" "*.bzlmod"];
             };
           };
 
           settings.formatter = {
-            buf = {
-              command = pkgs.writeShellScriptBin "buf.sh" ''
-                for f in $@; do
-                  ${pkgs.buf}/bin/buf format --exit-code > /dev/null "$f" || ${pkgs.buf}/bin/buf format -w "$f"
-                done
-              '';
-              includes = ["*.proto"];
-            };
-
             taplo = {
               command = "${pkgs.taplo}/bin/taplo";
               options = [
@@ -175,11 +136,6 @@
               ];
               includes = ["*.kt" "*.kts"];
             };
-
-            buildifier = {
-              command = "${pkgs.bazel-buildtools}/bin/buildifier";
-              includes = ["BUILD" "WORKSPACE" "MODULE" "*.bzl" "*.bazel" "*.bzlmod"];
-            };
           };
 
           flakeCheck = false;
@@ -188,14 +144,6 @@
         pre-commit = {
           settings = {
             hooks.treefmt.enable = true;
-
-            hooks.buf-lint = {
-              enable = true;
-              name = "Buf Lint";
-              entry = "${pkgs.buf}/bin/buf lint";
-              types = ["proto"];
-              pass_filenames = false;
-            };
           };
         };
       };