Skip to content

Commit fe3f7a4

Browse files
aignasrickeylev
andauthored
ci: rm the lock file testing (bazel-contrib#2430)
This was not something that turned out to be useful and it is causing enough friction that it makes it not worth it. Summary: - remove presubmit checks checking lockfile - remove the pre-commit hooks for lock file updating - remove the note about the lock file - remove the MODULE.bazel.lock --------- Co-authored-by: Richard Levasseur <[email protected]>
1 parent 1aee4bf commit fe3f7a4

File tree

6 files changed

+1
-20066
lines changed

6 files changed

+1
-20066
lines changed

.bazelci/presubmit.yml

-22
Original file line numberDiff line numberDiff line change
@@ -298,28 +298,6 @@ tasks:
298298
working_directory: examples/bzlmod
299299
platform: windows
300300
bazel: last_rc
301-
integration_test_bzlmod_ubuntu_lockfile:
302-
<<: *reusable_build_test_all
303-
<<: *coverage_targets_example_bzlmod
304-
name: "examples/bzlmod: Ubuntu with lockfile"
305-
working_directory: examples/bzlmod
306-
platform: ubuntu2004
307-
bazel: 7.x
308-
shell_commands:
309-
# Update the lockfiles and fail if it is different.
310-
- "../../tools/private/update_bzlmod_lockfiles.sh"
311-
- "git diff --exit-code"
312-
integration_test_bzlmod_macos_lockfile:
313-
<<: *reusable_build_test_all
314-
<<: *coverage_targets_example_bzlmod
315-
name: "examples/bzlmod: macOS with lockfile"
316-
working_directory: examples/bzlmod
317-
platform: macos
318-
bazel: 7.x
319-
shell_commands:
320-
# Update the lockfiles and fail if it is different.
321-
- "../../tools/private/update_bzlmod_lockfiles.sh"
322-
- "git diff --exit-code"
323301

324302
integration_test_bzlmod_generate_build_file_generation_ubuntu_min:
325303
<<: *minimum_supported_version

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,3 @@ user.bazelrc
5252
# MODULE.bazel.lock is ignored for now as per recommendation from upstream.
5353
# See https://github.com/bazelbuild/bazel/issues/20369
5454
MODULE.bazel.lock
55-
!/examples/bzlmod/MODULE.bazel.lock

.pre-commit-config.yaml

-6
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,3 @@ repos:
4949
entry: bazel run @rules_bazel_integration_test//tools:update_deleted_packages
5050
files: ^((examples|tests)/.*/(MODULE.bazel|WORKSPACE|WORKSPACE.bzlmod|BUILD.bazel)|.bazelrc)$
5151
pass_filenames: false
52-
- id: update-bzlmod-lockfiles
53-
name: Update bzlmod lockfiles
54-
language: script
55-
entry: ./tools/private/update_bzlmod_lockfiles.sh
56-
files: ^python/
57-
pass_filenames: false

DEVELOPING.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ The fix being included is commit `deadbeef`.
5656
1. `git checkout -b release/0.37 0.37.0`
5757
1. `git push upstream release/0.37`
5858
1. `git cherry-pick -x deadbeef`
59-
1. Fix merge conflicts, if any. If `MODULE.bazel.lock` conflicts occur, then
60-
run `pre-commit run update-bzlmod-lockfiles -a`
59+
1. Fix merge conflicts, if any.
6160
1. `git cherry-pick --continue` (if applicable)
6261
1. `git push upstream`
6362

0 commit comments

Comments
 (0)