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

ci: add macos clippy test #34272

Merged
merged 4 commits into from
Nov 30, 2023
Merged

Conversation

yihau
Copy link
Member

@yihau yihau commented Nov 29, 2023

Problem

we may accidentally merge some code that can break the macOS/Windows build

Summary of Changes

run clippy for macos.

(I would like to have Windows as well but it takes me too much time to fix 😢 so let's ship macos first)

@yihau yihau force-pushed the github-actions-cargo-test branch from 0aaa7ca to 41f303c Compare November 29, 2023 19:04
@yihau yihau marked this pull request as ready for review November 29, 2023 19:43
@t-nelson
Copy link
Contributor

thanks! looking pretty good. is this a problem?

Screenshot from 2023-11-29 15-00-33

also i think @CriesofCarrots mentioned that there's a bench that still fails macos clippy, but i don't see it raised here. not sure if it's been fixed or we aren't running against benches?

@yihau
Copy link
Member Author

yihau commented Nov 30, 2023

is this a problem?

where did you get this one 🤔 this is mine from here

screenshot

also i think CriesofCarrots mentioned that there's a bench that still fails macos clippy, but i don't see it raised here. not sure if it's been fixed or we aren't running against benches?

weird. I don't see any complains from this pipeline. let's wait for her insight!

@t-nelson
Copy link
Contributor

where did you get this one 🤔 this is mine from here

weird. looks fine on this run. not sure how to dig through historical ones, but it showed an error when i first reviewd

CriesofCarrots
CriesofCarrots previously approved these changes Nov 30, 2023
Copy link
Contributor

@CriesofCarrots CriesofCarrots left a comment

Choose a reason for hiding this comment

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

That bench that fails clippy on my machine is doing so because it calls jit_compile(), which is only available for x86_64. I'm on silicon and do not have rosetta installed, whereas the CI runner is intel.
I think we can move forward with this PR for now, but it might be nice to add an arm64 runner in the future.
Meanwhile, I'll PR tagging that bench as x86_64-only. (edit) #34282

@yihau
Copy link
Member Author

yihau commented Nov 30, 2023

@CriesofCarrots sorry for the force push. I didn't notice you already have a PR for tagging the bench test. just removed mine.

@yihau yihau merged commit 4832b4e into solana-labs:master Nov 30, 2023
22 checks passed
@yihau yihau deleted the github-actions-cargo-test branch November 30, 2023 16:59
@CriesofCarrots
Copy link
Contributor

Hey @yihau , the macos clippy job didn't run on this PR to v1.16, and hence automerge did not work.
I think we need to backport this to fix automerge for stable and beta?

@yihau
Copy link
Member Author

yihau commented Dec 10, 2023

yeah! we should have it for v1.16 and v1.17! thank you for brining this up!

@yihau yihau added v1.16 PRs that should be backported to v1.16 v1.17 PRs that should be backported to v1.17 labels Dec 10, 2023
Copy link
Contributor

mergify bot commented Dec 10, 2023

Backports to the stable branch are to be avoided unless absolutely necessary for fixing bugs, security issues, and perf regressions. Changes intended for backport should be structured such that a minimum effective diff can be committed separately from any refactoring, plumbing, cleanup, etc that are not strictly necessary to achieve the goal. Any of the latter should go only into master and ride the normal stabilization schedule.

Copy link
Contributor

mergify bot commented Dec 10, 2023

Backports to the beta branch are to be avoided unless absolutely necessary for fixing bugs, security issues, and perf regressions. Changes intended for backport should be structured such that a minimum effective diff can be committed separately from any refactoring, plumbing, cleanup, etc that are not strictly necessary to achieve the goal. Any of the latter should go only into master and ride the normal stabilization schedule. Exceptions include CI/metrics changes, CLI improvements and documentation updates on a case by case basis.

mergify bot pushed a commit that referenced this pull request Dec 10, 2023
* ci: add clippy test for macos and windows

* ci: remove windows from clippy test

* ci: cancel cargo clippy on Github Actions when new commits comming

* ci: set -e for .github/scripts/cargo-clippy-before-script.sh

(cherry picked from commit 4832b4e)
mergify bot pushed a commit that referenced this pull request Dec 10, 2023
* ci: add clippy test for macos and windows

* ci: remove windows from clippy test

* ci: cancel cargo clippy on Github Actions when new commits comming

* ci: set -e for .github/scripts/cargo-clippy-before-script.sh

(cherry picked from commit 4832b4e)
mergify bot added a commit that referenced this pull request Dec 10, 2023
* ci: add macos clippy test (#34272)

* ci: add clippy test for macos and windows

* ci: remove windows from clippy test

* ci: cancel cargo clippy on Github Actions when new commits comming

* ci: set -e for .github/scripts/cargo-clippy-before-script.sh

(cherry picked from commit 4832b4e)

* scripts/cargo-clippy.sh: Extract our non-trivial cargo clippy command (manual backport of #33982)

---------

Co-authored-by: Yihau Chen <a122092487@gmail.com>
Co-authored-by: yihau <yihau.chen@icloud.com>
mergify bot added a commit that referenced this pull request Dec 10, 2023
* ci: add macos clippy test (#34272)

* ci: add clippy test for macos and windows

* ci: remove windows from clippy test

* ci: cancel cargo clippy on Github Actions when new commits comming

* ci: set -e for .github/scripts/cargo-clippy-before-script.sh

(cherry picked from commit 4832b4e)

* scripts/cargo-clippy.sh: Extract our non-trivial cargo clippy command (manual backport of #33982)

---------

Co-authored-by: Yihau Chen <a122092487@gmail.com>
Co-authored-by: yihau <yihau.chen@icloud.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
v1.16 PRs that should be backported to v1.16 v1.17 PRs that should be backported to v1.17
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants