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 bazel-contrib/setup-bazel instead of manually installing a deb during CI #665

Merged
merged 4 commits into from
Sep 17, 2024
Merged

Use bazel-contrib/setup-bazel instead of manually installing a deb during CI #665

merged 4 commits into from
Sep 17, 2024

Conversation

dougthor42
Copy link
Contributor

Use bazel-contrib/setup-bazel instead of manually installing a deb during CI

Also fix some EOL whitespace because that's how my vim is configured.

@95-martin-orion

…ring CI

Also fix some EOL whitespace because that's how my vim is configured.
@NoureldinYosri NoureldinYosri added the kokoro:run Trigger Kokoro builds for this PR. label Jul 2, 2024
@qsim-qsimh-bot qsim-qsimh-bot removed the kokoro:run Trigger Kokoro builds for this PR. label Jul 2, 2024
@@ -22,12 +22,14 @@ jobs:

steps:
- uses: actions/checkout@v2
- uses: bazel-contrib/[email protected]
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not immediately clear to me how (or if) this specifies the bazel version to install. IIRC, this is important for qsim as it needs to align with the bazel version used in TFQ for compatibility reasons.

Can we lock the bazel version to 5.3.0 here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The bazel version is locked by .bazelversion in the root of the repo, and that's already set to 5.3.0.

setup-bazel will install bazelisk 1.x as bazel and then any time bazel is called, bazelisk will download and install the bazel version defined by .bazelversion if the file exists (which it does 🙃)

More info on how bazelisk determines which version of bazel to run can be found here: https://github.com/bazelbuild/bazelisk?tab=readme-ov-file#how-does-bazelisk-know-which-bazel-version-to-run

@dougthor42
Copy link
Contributor Author

BTW, the context for this is https://github.com/qh-lab/pyle/pull/46833#issuecomment-2204296035

@95-martin-orion 95-martin-orion added the kokoro:run Trigger Kokoro builds for this PR. label Jul 8, 2024
@qsim-qsimh-bot qsim-qsimh-bot removed the kokoro:run Trigger Kokoro builds for this PR. label Jul 8, 2024
Copy link
Collaborator

@95-martin-orion 95-martin-orion left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes LGTM, although it looks like we may need to claw back MacOS support before merging.

@95-martin-orion
Copy link
Collaborator

@dougthor42 - #672 fixed the CI failures. If you're still interested in getting this merged, resolve conflicts and retry.

If I'm not available for final approval, request review from @pavoljuhas.

@dougthor42
Copy link
Contributor Author

Conflicts fixed, please approve CI run.

@95-martin-orion 95-martin-orion added the kokoro:run Trigger Kokoro builds for this PR. label Sep 17, 2024
@qsim-qsimh-bot qsim-qsimh-bot removed the kokoro:run Trigger Kokoro builds for this PR. label Sep 17, 2024
@95-martin-orion 95-martin-orion merged commit 55b4d0e into quantumlib:master Sep 17, 2024
16 checks passed
@dougthor42 dougthor42 deleted the u/dthor/bazelisk branch September 17, 2024 17:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants