Skip to content

Look for WORKSPACE.bazel as well in Bazel wrapper script#12760

Closed
GMNGeoffrey wants to merge 3 commits intobazelbuild:masterfrom
GMNGeoffrey:patch-1
Closed

Look for WORKSPACE.bazel as well in Bazel wrapper script#12760
GMNGeoffrey wants to merge 3 commits intobazelbuild:masterfrom
GMNGeoffrey:patch-1

Conversation

@GMNGeoffrey
Copy link
Copy Markdown
Contributor

@GMNGeoffrey GMNGeoffrey commented Dec 29, 2020

WORKSPACE.bazel is a valid alternative name for this file
(https://docs.bazel.build/versions/master/build-ref.html#workspace)

@google-cla google-cla Bot added the cla: yes label Dec 29, 2020
@GMNGeoffrey
Copy link
Copy Markdown
Contributor Author

GMNGeoffrey commented Dec 29, 2020

@philwo PTAL

copybara-service Bot pushed a commit to iree-org/iree that referenced this pull request Dec 29, 2020
@GMNGeoffrey @iree-copybara-bot
The Bazel versioning wrapper script doesn't look for WORKSPACE.bazel
670f223 
bazelbuild/bazel#12760 should fix that in
Bazel, but it will be a bit before it's rolled out.

Reverts 1148698

PiperOrigin-RevId: 349445290
@copybara-service copybara-service Bot mentioned this pull request Dec 29, 2020
Merged
copybara-service Bot pushed a commit to iree-org/iree that referenced this pull request Dec 29, 2020
@GMNGeoffrey @iree-copybara-bot
Revert "Rename WORKSPACE to WORKSPACE.bazel"
cbfc9de 
The Bazel versioning wrapper script doesn't look for WORKSPACE.bazel

bazelbuild/bazel#12760 should fix that in
Bazel, but it will be a bit before it's rolled out.

Reverts 1148698

PiperOrigin-RevId: 349445290
copybara-service Bot pushed a commit to iree-org/iree that referenced this pull request Dec 29, 2020
@GMNGeoffrey @iree-copybara-bot
Revert "Rename WORKSPACE to WORKSPACE.bazel"
cb34d47 
The Bazel versioning wrapper script doesn't look for WORKSPACE.bazel

bazelbuild/bazel#12760 should fix that in
Bazel, but it will be a bit before it's rolled out.

Reverts 1148698

PiperOrigin-RevId: 349453240
@philwo
Copy link
Copy Markdown
Member

philwo commented Jan 8, 2021

LGTM, but please fix the failing tests.

@GMNGeoffrey
Copy link
Copy Markdown
Contributor Author

GMNGeoffrey commented Jan 11, 2021

LGTM, but please fix the failing tests.

Done (syntax error). And since this revealed where the tests were, I added a test for this case. How do you usually merge PRs? Would you like me to squash this into a single commit?

Also, since this is the thing that detects which version to use, I'm not sure just releasing it with the next release it would be a part of makes sense. Basically no one who relies on .bazelversion could safely rename their WORKSPACE file to WORKSPACE.bazel right now as long as there's any likelihood of someone using bazel <4. Maybe it would make sense to do a patch release for old versions?

@jin jin added area-EngProd Bazel CI, infrastructure, bootstrapping, release, and distribution tooling team-OSS Issues for the Bazel OSS team: installation, release processBazel packaging, website labels Jan 15, 2021
@jin
Copy link
Copy Markdown
Member

jin commented Jan 15, 2021

Imported PR to internal review, @philwo please feel free to LGTM that if there are no actionables here.

@bazel-io bazel-io closed this in 219eac8 Jan 19, 2021
@GMNGeoffrey GMNGeoffrey deleted the patch-1 branch January 26, 2021 02:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@philwo philwo philwo approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@philwo philwo

Labels

area-EngProd Bazel CI, infrastructure, bootstrapping, release, and distribution tooling cla: yes team-OSS Issues for the Bazel OSS team: installation, release processBazel packaging, website

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@GMNGeoffrey @philwo @jin