Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(bazel): Always disable the wrapper script #8835

Merged
merged 1 commit into from
Jul 3, 2024

Conversation

fviernau
Copy link
Member

@fviernau fviernau commented Jul 3, 2024

Fixes #8828.

@fviernau fviernau requested a review from a team as a code owner July 3, 2024 10:22
@fviernau
Copy link
Member Author

fviernau commented Jul 3, 2024

@nnobelis mind testing if this works?

@fviernau fviernau enabled auto-merge (rebase) July 3, 2024 10:22
@fviernau fviernau force-pushed the bazel-disable-wrapper branch 2 times, most recently from 3487171 to 254f05a Compare July 3, 2024 10:38
@nnobelis
Copy link
Member

nnobelis commented Jul 3, 2024

Yes it works, thanks.

Comment on lines 85 to 88
environment = environment.toMutableMap().apply {
// Disable the optional wrapper script under `tools/bazel`, to ensure the --version option works.
put("BAZELISK_SKIP_WRAPPER", "true")
}
Copy link
Member

@sschuberth sschuberth Jul 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I propose to use the shorter environment + mapOf("BAZELISK_SKIP_WRAPPER" to "true") instead.

Copy link

codecov bot commented Jul 3, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 67.79%. Comparing base (d332eba) to head (310470d).
Report is 3 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff            @@
##               main    #8835   +/-   ##
=========================================
  Coverage     67.79%   67.79%           
  Complexity     1164     1164           
=========================================
  Files           243      243           
  Lines          7711     7711           
  Branches        861      861           
=========================================
  Hits           5228     5228           
  Misses         2127     2127           
  Partials        356      356           
Flag Coverage Δ
funTest-non-docker 33.96% <ø> (ø)
test 38.12% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@fviernau fviernau force-pushed the bazel-disable-wrapper branch from 254f05a to 310470d Compare July 3, 2024 11:00
@fviernau fviernau requested a review from sschuberth July 3, 2024 11:00
@sschuberth sschuberth disabled auto-merge July 3, 2024 11:26
@sschuberth
Copy link
Member

The NuGetFunTest failure is unrelated.

@sschuberth sschuberth merged commit 6aaa408 into main Jul 3, 2024
19 of 20 checks passed
@sschuberth sschuberth deleted the bazel-disable-wrapper branch July 3, 2024 11:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bazel: disable Bazelisk optional wrapper script when fetching the version of Bazel
3 participants