From a9b029964a10d2db60dc32f1fec3fbc622b8a68a Mon Sep 17 00:00:00 2001 From: Fabian Meumertzheim Date: Wed, 17 May 2023 20:10:50 +0200 Subject: [PATCH] Fix go_path link mode --- .bazelci/presubmit.yml | 5 ----- .bazelrc | 6 ------ go/private/tools/path.bzl | 2 +- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index 31c16da508..e1709c7eb5 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml @@ -13,11 +13,6 @@ tasks: - tests/core/cgo/generate_imported_dylib.sh build_targets: - "//..." - test_flags: - # Temporary rollback to fix //tests/core/go_path builds - # https://github.com/bazelbuild/continuous-integration/commit/a95a916098d3015bb4ea20b7e33bc7d27d00bffc - - "--remote_download_outputs=all" - - "--build_runfile_links" test_targets: - "//..." ubuntu2004: diff --git a/.bazelrc b/.bazelrc index 0653fb75b0..d8b82d91dd 100644 --- a/.bazelrc +++ b/.bazelrc @@ -1,11 +1,5 @@ common --enable_platform_specific_config -# //tests/core/go_path is incompatible with BwoB, which is enabled in Bazel CI. -# https://github.com/bazelbuild/continuous-integration/commit/a95a916098d3015bb4ea20b7e33bc7d27d00bffc -build --remote_download_outputs=all -build --build_runfile_links -build --experimental_remote_download_regex=.*tests/core/go_path/.* - # Go requires a C toolchain that accepts options and emits errors like # gcc or clang. The Go SDK does not support MSVC. build:windows --cpu=x64_windows diff --git a/go/private/tools/path.bzl b/go/private/tools/path.bzl index d1ef0d33df..f4ecb49af9 100644 --- a/go/private/tools/path.bzl +++ b/go/private/tools/path.bzl @@ -134,7 +134,7 @@ def _go_path_impl(ctx): # Declare individual outputs in link mode. Symlinks can't point outside # tree artifacts. outputs = [ - ctx.actions.declare_file(ctx.label.name + "/" + e.dst) + ctx.actions.declare_symlink(ctx.label.name + "/" + e.dst) for e in manifest_entries ] tag = ctx.actions.declare_file(ctx.label.name + "/.tag")