Skip to content

Commit

Permalink
ci: rm the lock file testing (#2430)
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
aignas and rickeylev authored Nov 21, 2024
1 parent 1aee4bf commit fe3f7a4
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 20,066 deletions.
22 changes: 0 additions & 22 deletions .bazelci/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -298,28 +298,6 @@ tasks:
working_directory: examples/bzlmod
platform: windows
bazel: last_rc
integration_test_bzlmod_ubuntu_lockfile:
<<: *reusable_build_test_all
<<: *coverage_targets_example_bzlmod
name: "examples/bzlmod: Ubuntu with lockfile"
working_directory: examples/bzlmod
platform: ubuntu2004
bazel: 7.x
shell_commands:
# Update the lockfiles and fail if it is different.
- "../../tools/private/update_bzlmod_lockfiles.sh"
- "git diff --exit-code"
integration_test_bzlmod_macos_lockfile:
<<: *reusable_build_test_all
<<: *coverage_targets_example_bzlmod
name: "examples/bzlmod: macOS with lockfile"
working_directory: examples/bzlmod
platform: macos
bazel: 7.x
shell_commands:
# Update the lockfiles and fail if it is different.
- "../../tools/private/update_bzlmod_lockfiles.sh"
- "git diff --exit-code"

integration_test_bzlmod_generate_build_file_generation_ubuntu_min:
<<: *minimum_supported_version
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,3 @@ user.bazelrc
# MODULE.bazel.lock is ignored for now as per recommendation from upstream.
# See https://github.com/bazelbuild/bazel/issues/20369
MODULE.bazel.lock
!/examples/bzlmod/MODULE.bazel.lock
6 changes: 0 additions & 6 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,3 @@ repos:
entry: bazel run @rules_bazel_integration_test//tools:update_deleted_packages
files: ^((examples|tests)/.*/(MODULE.bazel|WORKSPACE|WORKSPACE.bzlmod|BUILD.bazel)|.bazelrc)$
pass_filenames: false
- id: update-bzlmod-lockfiles
name: Update bzlmod lockfiles
language: script
entry: ./tools/private/update_bzlmod_lockfiles.sh
files: ^python/
pass_filenames: false
3 changes: 1 addition & 2 deletions DEVELOPING.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ The fix being included is commit `deadbeef`.
1. `git checkout -b release/0.37 0.37.0`
1. `git push upstream release/0.37`
1. `git cherry-pick -x deadbeef`
1. Fix merge conflicts, if any. If `MODULE.bazel.lock` conflicts occur, then
run `pre-commit run update-bzlmod-lockfiles -a`
1. Fix merge conflicts, if any.
1. `git cherry-pick --continue` (if applicable)
1. `git push upstream`

Expand Down
Loading

0 comments on commit fe3f7a4

Please sign in to comment.