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.

Sign up for GitHub

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

Jump to bottom

bazel: upgrade to Bazel 7.2.1 #127868

Merged
merged 1 commit into from
Jul 30, 2024
Merged

bazel: upgrade to Bazel 7.2.1 #127868

merged 1 commit into from
Jul 30, 2024

Conversation

rickystewart
Copy link
Collaborator

We set -DBAZEL_TRACK_SOURCE_DIRECTORIES=1 as a workaround for a bug in rules_js. See aspect-build/rules_js#1408 for more details.

Closes #123237
Epic: CRDB-17171

Release note: None

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@rickystewart rickystewart force-pushed the bazel-upgrade-7-2-1 branch 2 times, most recently from 123e28f to 1f34bff Compare July 30, 2024 15:53
@rickystewart
bazel: upgrade to Bazel 7.2.1
0702e86 
We set `-DBAZEL_TRACK_SOURCE_DIRECTORIES=1` as a workaround for a bug in
`rules_js`. See aspect-build/rules_js#1408 for more details.

Closes cockroachdb#123237
Epic: CRDB-17171

Release note: None
@rickystewart rickystewart force-pushed the bazel-upgrade-7-2-1 branch from 1f34bff to 0702e86 Compare July 30, 2024 15:56
@rickystewart rickystewart requested a review from rail July 30, 2024 16:27
@rickystewart rickystewart marked this pull request as ready for review July 30, 2024 16:27
@rickystewart rickystewart requested review from a team as code owners July 30, 2024 16:27
@rickystewart rickystewart requested review from kyle-a-wong, arjunmahishi, aa-joshi, nameisbhaskar, DarrylWong, rytaft and msbutler and removed request for a team July 30, 2024 16:27
@rickystewart rickystewart added backport-24.1.x Flags PRs that need to be backported to 24.1. backport-24.2.x Flags PRs that need to be backported to 24.2 labels Jul 30, 2024
@rickystewart
Copy link
Collaborator Author

YOLO

bors r=rail

@rickystewart
Copy link
Collaborator Author

bors r=rail

@craig
Copy link
Contributor

craig bot commented Jul 30, 2024

Build succeeded:

@craig craig bot merged commit edf5a26 into cockroachdb:master Jul 30, 2024
22 checks passed
@blathers-crl blathers-crl bot mentioned this pull request Jul 30, 2024
Closed
@blathers-crl blathers[crl]
Copy link

blathers-crl bot commented Jul 30, 2024

Based on the specified backports for this PR, I applied new labels to the following linked issue(s). Please adjust the labels as needed to match the branches actually affected by the issue(s), including adding any known older branches.

Issue #123237: branch-release-24.1, branch-release-24.2.

🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

@blathers-crl blathers[crl]
Copy link

blathers-crl bot commented Jul 30, 2024

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.

error creating merge commit from 0702e86 to blathers/backport-release-24.1-127868: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 24.1.x failed. See errors above.

error creating merge commit from 0702e86 to blathers/backport-release-24.2-127868: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 24.2.x failed. See errors above.

🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

This was referenced Jul 30, 2024
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rail rail rail approved these changes

@kyle-a-wong kyle-a-wong Awaiting requested review from kyle-a-wong kyle-a-wong is a code owner automatically assigned from cockroachdb/obs-prs

@arjunmahishi arjunmahishi Awaiting requested review from arjunmahishi arjunmahishi is a code owner automatically assigned from cockroachdb/obs-india-prs

@aa-joshi aa-joshi Awaiting requested review from aa-joshi aa-joshi is a code owner automatically assigned from cockroachdb/obs-india-prs

@nameisbhaskar nameisbhaskar Awaiting requested review from nameisbhaskar nameisbhaskar is a code owner automatically assigned from cockroachdb/test-eng

@DarrylWong DarrylWong Awaiting requested review from DarrylWong DarrylWong is a code owner automatically assigned from cockroachdb/test-eng

@rytaft rytaft Awaiting requested review from rytaft rytaft is a code owner automatically assigned from cockroachdb/sql-queries-prs

@msbutler msbutler Awaiting requested review from msbutler msbutler was automatically assigned from cockroachdb/disaster-recovery

Assignees
No one assigned
Labels
backport-24.1.x Flags PRs that need to be backported to 24.1. backport-24.2.x Flags PRs that need to be backported to 24.2
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

bazel: update to Bazel 7
3 participants
@rickystewart @cockroach-teamcity @rail