[buck2] update samples to may buck2 release

buck2/golang/go/BUCK

@@ -18,4 +18,6 @@ go_binary(
     deps = [
         "//go/greeting:greeting",
     ],
+    # Disable cgo as clang is not available in the container.
+    cgo_enabled = False,
 )

buck2/golang/go/greeting/BUCK

@@ -21,4 +21,6 @@ go_library(
 go_test(
     name = "greeting_test",
     srcs = glob(["*.go"]),
+    # Disable cgo as clang is not available in the container.
+    cgo_enabled = False,
 )

buck2/golang/toolchains/defs.bzl

@@ -14,21 +14,22 @@
 
 load("@prelude//go:toolchain.bzl", "GoToolchainInfo")
 load("@prelude//go_bootstrap:go_bootstrap.bzl", "GoBootstrapToolchainInfo")
-load("@prelude//utils:cmd_script.bzl", "ScriptOs", "cmd_script")
+load("@prelude//os_lookup:defs.bzl", "ScriptLanguage")
+load("@prelude//utils:cmd_script.bzl", "cmd_script")
 
 def _remote_go_bootstrap_toolchain_impl(ctx):
     go_arch = "amd64"
     go_os = "linux"
 
-    script_os = ScriptOs("unix")
+    script_language = ScriptLanguage("sh")
     go = "go"
 
     return [
         DefaultInfo(),
         GoBootstrapToolchainInfo(
             env_go_arch = go_arch,
             env_go_os = go_os,
-            go = RunInfo(cmd_script(ctx, "go", cmd_args(go), script_os)),
+            go = RunInfo(cmd_script(ctx, "go", cmd_args(go), script_language)),
             go_wrapper = ctx.attrs.go_wrapper[RunInfo],
         ),
     ]
@@ -50,27 +51,26 @@ def _remote_go_toolchain_impl(ctx):
     go_arch = "amd64"
     go_os = "linux"
 
-    script_os = ScriptOs("unix")
+    script_language = ScriptLanguage("sh")
     go = "go"
 
     return [
         DefaultInfo(),
         GoToolchainInfo(
-            assembler = RunInfo(cmd_script(ctx, "asm", cmd_args(go, "tool", "asm"), script_os)),
-            cgo = RunInfo(cmd_script(ctx, "cgo", cmd_args(go, "tool", "cgo"), script_os)),
+            assembler = RunInfo(cmd_script(ctx, "asm", cmd_args(go, "tool", "asm"), script_language)),
+            cgo = RunInfo(cmd_script(ctx, "cgo", cmd_args(go, "tool", "cgo"), script_language)),
             cgo_wrapper = ctx.attrs.cgo_wrapper[RunInfo],
             concat_files = ctx.attrs.concat_files[RunInfo],
-            compiler = RunInfo(cmd_script(ctx, "compile", cmd_args(go, "tool", "compile"), script_os)),
-            cover = RunInfo(cmd_script(ctx, "cover", cmd_args(go, "tool", "cover"), script_os)),
-            default_cgo_enabled = False,
+            compiler = RunInfo(cmd_script(ctx, "compile", cmd_args(go, "tool", "compile"), script_language)),
+            cover = RunInfo(cmd_script(ctx, "cover", cmd_args(go, "tool", "cover"), script_language)),
             env_go_arch = go_arch,
             env_go_os = go_os,
             external_linker_flags = [],
             gen_stdlib_importcfg = ctx.attrs.gen_stdlib_importcfg[RunInfo],
-            go = RunInfo(cmd_script(ctx, "go", cmd_args(go), script_os)),
+            go = RunInfo(cmd_script(ctx, "go", cmd_args(go), script_language)),
             go_wrapper = ctx.attrs.go_wrapper[RunInfo],
-            linker = RunInfo(cmd_script(ctx, "link", cmd_args(go, "tool", "link"), script_os)),
-            packer = RunInfo(cmd_script(ctx, "pack", cmd_args(go, "tool", "pack"), script_os)),
+            linker = RunInfo(cmd_script(ctx, "link", cmd_args(go, "tool", "link"), script_language)),
+            packer = RunInfo(cmd_script(ctx, "pack", cmd_args(go, "tool", "pack"), script_language)),
             linker_flags = [],
             assembler_flags = [],
             compiler_flags = [],

buck2/rust/toolchains/defs.bzl

@@ -14,7 +14,6 @@
 
 load("@prelude//cxx:cxx_toolchain_types.bzl", "LinkerType")
 load("@prelude//rust:rust_toolchain.bzl", "PanicRuntime", "RustToolchainInfo")
-load("@prelude//rust/tools:attrs.bzl", "internal_tool_attrs")
 load("@prelude//toolchains:cxx.bzl", "CxxToolsInfo")
 
 # This def is similar to the one in https://github.com/facebook/buck2/blob/804d62242214455d51787f7c8c96a1e12c75ec32/prelude/toolchains/cxx/clang/tools.bzl
@@ -54,26 +53,21 @@ def _remote_rust_toolchain_impl(ctx):
             panic_runtime = PanicRuntime("unwind"),
             deny_lints = ctx.attrs.deny_lints,
             doctests = ctx.attrs.doctests,
-            failure_filter_action = ctx.attrs.failure_filter_action[RunInfo],
             nightly_features = ctx.attrs.nightly_features,
             report_unused_deps = ctx.attrs.report_unused_deps,
-            rustc_action = ctx.attrs.rustc_action[RunInfo],
             rustc_binary_flags = ctx.attrs.rustc_binary_flags,
             rustc_flags = ctx.attrs.rustc_flags,
             rustc_target_triple = ctx.attrs.rustc_target_triple,
             rustc_test_flags = ctx.attrs.rustc_test_flags,
             rustdoc = RunInfo(args = [ctx.attrs.rustdoc]),
             rustdoc_flags = ctx.attrs.rustdoc_flags,
-            rustdoc_test_with_resources = ctx.attrs.rustdoc_test_with_resources[RunInfo],
-            rustdoc_coverage = ctx.attrs.rustdoc_coverage[RunInfo],
-            transitive_dependency_symlinks_tool = ctx.attrs.transitive_dependency_symlinks_tool[RunInfo],
             warn_lints = ctx.attrs.warn_lints,
         ),
     ]
 
 remote_rust_toolchain = rule(
     impl = _remote_rust_toolchain_impl,
-    attrs = internal_tool_attrs | {
+    attrs = {
         "allow_lints": attrs.list(attrs.string(), default = []),
         "clippy_driver": attrs.string(default = "clippy-driver"),
         "clippy_toml": attrs.option(attrs.dep(providers = [DefaultInfo]), default = None),

infra/setup-buck2.sh

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 set -xe
 
-# Get the Buck2 binary - pinned to https://github.com/facebook/buck2/releases/tag/2024-03-01
-curl -L -O https://github.com/facebook/buck2/releases/download/2025-03-01/buck2-x86_64-unknown-linux-musl.zst
+# Get the Buck2 binary - pinned to https://github.com/facebook/buck2/releases/tag/2025-05-06
+curl -L -O https://github.com/facebook/buck2/releases/download/2025-05-06/buck2-x86_64-unknown-linux-musl.zst
 
 # Unpack the binary.
 unzstd buck2-x86_64-unknown-linux-musl.zst