Skip to content

Commit

Permalink
Move the stopgap for python issues.
Browse files Browse the repository at this point in the history
Due to upstream bazel testing, the flag has to be globally applied instead
of targeted to specific bazel versions. Opened
  bazelbuild/continuous-integration#709
to see if there is a better path around screening/suppressing stuff like
this.

RELNOTES: None.
PiperOrigin-RevId: 252056267
  • Loading branch information
thomasvl authored and swiple-rules-gardener committed Jun 7, 2019
1 parent 6ea5e28 commit 28844d7
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
6 changes: 0 additions & 6 deletions .bazelci/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,9 @@ tasks:
name: "Last Green Bazel"
platform: macos
bazel: last_green
build_flags:
# Stop gap for https://github.com/bazelbuild/rules_apple/issues/456
- "--host_force_python=PY2"
build_targets:
- "tools/..."
- "test/..."
test_flags:
# Stop gap
- "--host_force_python=PY2"
test_targets:
- "tools/..."
- "test/..."
Expand Down
8 changes: 8 additions & 0 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,11 @@ build --experimental_starlark_config_transitions
# TODO(b/134144964): Formality to track removing this, but we all know it'll be
# here forever.
build --define=RULES_SWIFT_BUILD_DUMMY_WORKER=1

# Stop gap for https://github.com/bazelbuild/rules_apple/issues/456
# This sucks, this is really only wanted when testing against the head bazel,
# that could be hooked within our config when making that config, but then
# things still fail on https://buildkite.com/bazel/bazel-at-head-plus-downstream
# because there is no way to add the flag there so it has to be blindly add to
# all configs here, hoping it doesn't have any side effects.
build "--host_force_python=PY2"

0 comments on commit 28844d7

Please sign in to comment.