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

Use URLs as default canonical IDs in common repo rules #20128

Closed
wants to merge 1 commit into from

Conversation

fmeum
Copy link
Collaborator

@fmeum fmeum commented Nov 9, 2023

RELNOTES[INC]: The --experimental_repository_cache_urls_as_default_canonical_id flag is no longer available. Instead, the http_archive, http_file, http_jar, jvm_maven_import_external, and jvm_import_external repository rules now use the URLs as the canonical ID if none is provided explicitly. If this behavior is not desired, it can be disabled via --repo_env=BAZEL_HTTP_RULES_URLS_AS_DEFAULT_CANONICAL_ID=0.

Fixes #19749

Closes #20047.

PiperOrigin-RevId: 580826938
Change-Id: I32bfb04084ce75b74f664794e1924d3188f58805

Closes #19990

@fmeum fmeum requested a review from a team as a code owner November 9, 2023 19:20
RELNOTES[INC]: The `--experimental_repository_cache_urls_as_default_canonical_id` flag is no longer available. Instead, the `http_archive`, `http_file`, `http_jar`, `jvm_maven_import_external`, and `jvm_import_external` repository rules now use the URLs as the canonical ID if none is provided explicitly. If this behavior is not desired, it can be disabled via `--repo_env=BAZEL_HTTP_RULES_URLS_AS_DEFAULT_CANONICAL_ID=0`.

Fixes bazelbuild#19749

Closes bazelbuild#20047.

PiperOrigin-RevId: 580826938
Change-Id: I32bfb04084ce75b74f664794e1924d3188f58805
@github-actions github-actions bot added awaiting-review PR is awaiting review from an assigned reviewer team-ExternalDeps External dependency handling, remote repositiories, WORKSPACE file. labels Nov 9, 2023
@fmeum
Copy link
Collaborator Author

fmeum commented Nov 9, 2023

@keertk This merge conflict was purely due to MODULE.bazel.lock. We will probably see this more often in the future. We could look into updating the lockfile automatically as part of the cherry-pick workflow.

@keertk
Copy link
Member

keertk commented Nov 9, 2023

Good to know, thanks @fmeum! Makes sense to add this to the workflow.

@keertk keertk requested a review from Wyverald November 9, 2023 19:30
@keertk keertk enabled auto-merge (squash) November 9, 2023 19:31
@meteorcloudy
Copy link
Member

meteorcloudy commented Nov 10, 2023

Good idea, when MODULE.bazel.lock is the only conflict

git checkout --theirs MODULE.bazel.lock
bazel mod deps

should resolve it during cherry-pick.

@keertk
Copy link
Member

keertk commented Nov 10, 2023

Thank you both. Just created #20147 since we needed to fix this again. Closing this one.

@keertk keertk closed this Nov 10, 2023
auto-merge was automatically disabled November 10, 2023 20:01

Pull request was closed

@github-actions github-actions bot removed the awaiting-review PR is awaiting review from an assigned reviewer label Nov 10, 2023
@fmeum fmeum deleted the release-7.0.0-url branch November 11, 2023 17:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
team-ExternalDeps External dependency handling, remote repositiories, WORKSPACE file.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants