Fix breakages in postsubmits (#489)

- Fixed ndk examples on macOS
- Fixed rules examples on macOS
- Disabled `rust-08-grpc-client-server-linux`

.bazelci/android.yml

@@ -8,7 +8,6 @@ common:
       - "//app:app"
   android-ndk: &android-ndk
     name: "Android NDK"
-    bazel: 7.2.0rc1
     working_directory: ../android/ndk
     build_flags:
       - "--android_platforms=//:arm64-v8a,//:x86"
@@ -57,7 +56,7 @@ tasks:
       ANDROID_NDK_HOME: /opt/android-ndk-r25b
     <<: *android-ndk
   android-ndk-macos:
-    platform: macos
+    platform: macos_arm64
     environment:
       ANDROID_NDK_HOME: /Users/buildkite/android-ndk-r25b
     <<: *android-ndk

.bazelci/rules.yml

@@ -11,10 +11,10 @@ rolling: &rolling
 # Commmon features by platform
 #
 linux: &linux
-  platform: ubuntu1804
+  platform: ubuntu2204
 
 macos: &macos
-  platform: macos
+  platform: macos_arm64
 
 windows: &windows
   platform: windows
@@ -51,8 +51,6 @@ tasks:
   basics_macos_latest:
     name: basics_macos_latest
     <<: *macos
-    # It seems there is no rolling Bazel for macos.
-    bazel: last_green
     <<: *basics
   basics_windows_lts:
     name: basics_windows_lts

.bazelci/tutorial-rust.yml

@@ -2,67 +2,68 @@
 tasks:
   rust-01-hello-world-linux:
     name: "Rust Hello World"
-    platform: ubuntu1804
+    platform: ubuntu2204
     working_directory: ../rust-examples/01-hello-world
     build_targets:
       - "//..."
   rust-02-hello-cross-linux:
     name: "Rust Cross Compilation"
-    platform: ubuntu1804
+    platform: ubuntu2204
     working_directory: ../rust-examples/02-hello-cross
     build_targets:
       - "//:all"
   rust-02-hello-cross-mac:
     name: "Rust Cross Compilation"
-    platform: macos
+    platform: macos_arm64
     working_directory: ../rust-examples/02-hello-cross
     build_targets:
       - "//:all"
   rust-03-comp-opt-linux:
     name: "Rust Compiler Optimization"
-    platform: ubuntu1804
+    platform: ubuntu2204
     working_directory: ../rust-examples/03-comp-opt
     build_targets:
       - "//..."
   rust-04-ffi-linux:
     name: "Rust FFI"
-    platform: ubuntu1804
+    platform: ubuntu2204
     working_directory: ../rust-examples/04-ffi
     build_targets:
       - "//..."
   rust-05-deps-cargo-linux:
     name: "Rust Cargo Deps"
-    platform: ubuntu1804
+    platform: ubuntu2204
     working_directory: ../rust-examples/05-deps-cargo
     build_targets:
       - "//..."
   rust-06-deps-direct-linux:
     name: "Rust Direct Deps"
-    platform: ubuntu1804
+    platform: ubuntu2204
     working_directory: ../rust-examples/06-deps-direct
     build_targets:
       - "//..."
   rust-07-deps-vendor-linux:
     name: "Rust Vendored Deps"
-    platform: ubuntu1804
+    platform: ubuntu2204
     working_directory: ../rust-examples/07-deps-vendor
     build_targets:
       - "//..."
-  rust-08-grpc-client-server-linux:
-    name: "Rust grpc"
-    platform: ubuntu1804
-    working_directory: ../rust-examples/08-grpc-client-server
-    build_targets:
-      - "//:all"
+  # TODO: Renable after addressing https://github.com/bazelbuild/examples/pull/489#issuecomment-2321617323
+  # rust-08-grpc-client-server-linux:
+  #   name: "Rust grpc"
+  #   platform: ubuntu2204
+  #   working_directory: ../rust-examples/08-grpc-client-server
+  #   build_targets:
+  #     - "//:all"
   rust-08-grpc-client-server-macos:
     name: "Rust grpc"
-    platform: macos
+    platform: macos_arm64
     working_directory: ../rust-examples/08-grpc-client-server
     build_targets:
       - "//:all"
   rust-09-oci-container-linux:
     name: "Rust OCI"
-    platform: ubuntu1804
+    platform: ubuntu2204
     working_directory: ../rust-examples/09-oci-container
     build_targets:
       - "//..."

.gitignore

@@ -9,4 +9,6 @@ bazel-*
 target/
 # Xcode
 *.xcodeproj
-node_modules
+node_modules
+# Bazel lockfile
+*MODULE.bazel.lock

android/ndk/.bazelversion

@@ -1,2 +1,2 @@
-7.2.0rc1
+7.3.1
 

android/ndk/MODULE.bazel

@@ -3,13 +3,7 @@
 bazel_dep(name = "platforms", version = "0.0.10")
 bazel_dep(name = "rules_jvm_external", version = "5.3")
 bazel_dep(name = "rules_cc", version = "0.0.9")
-
-bazel_dep(name = "rules_android", version = "0.1.1")
-git_override(
-  module_name = "rules_android",
-  remote = "https://github.com/bazelbuild/rules_android",
-  commit = "93e27030d3f0defa39cbbc35195638cb772b0c27",
-)
+bazel_dep(name = "rules_android", version = "0.5.1")
 
 maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
 maven.install(

rules/computed_dependencies/hash.bzl

@@ -47,6 +47,7 @@ def _impl(ctx):
     ctx.actions.run_shell(
         outputs = [out],
         inputs = [processed],
+        use_default_shell_env = True,
         command = "md5sum < %s > %s" % (processed.path, out.path),
     )
 

rules/implicit_output/hash.bzl

@@ -6,18 +6,21 @@ def _impl(ctx):
     ctx.actions.run_shell(
         outputs = [ctx.outputs.md5],
         inputs = [ctx.file.src],
+        use_default_shell_env = True,
         command = "md5sum {} > {}".format(ctx.file.src.path, ctx.outputs.md5.path),
     )
 
     ctx.actions.run_shell(
         outputs = [ctx.outputs.sha1],
         inputs = [ctx.file.src],
+        use_default_shell_env = True,
         command = "sha1sum {} > {}".format(ctx.file.src.path, ctx.outputs.sha1.path),
     )
 
     ctx.actions.run_shell(
         outputs = [ctx.outputs.sha256],
         inputs = [ctx.file.src],
+        use_default_shell_env = True,
         command = "sha256sum {} > {}".format(ctx.file.src.path, ctx.outputs.sha256.path),
     )