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

Fix ci #74

Merged
merged 1 commit into from
Sep 7, 2023
Merged

Fix ci #74

merged 1 commit into from
Sep 7, 2023

Conversation

Dirreke
Copy link
Contributor

@Dirreke Dirreke commented Aug 29, 2023 •
edited
Loading

Close #73
Close #72

Update the ci target to allign with rust-lang.

because of rust-lang/compiler-team#648 , MIPS* target has been degreed to Tier3.
remove mips-unknown-linux-gnu
remove mips64-unknown-linux-gnuabi64
remove mips64el-unknown-linux-gnuabi64
remove mipsel-unknown-linux-gnu

add aarch64-unknown-linux-musl
add arm-unknown-linux-gnueabihf
add riscv64gc-unknown-linux-gnu

@Dirreke
Copy link
Contributor Author

Dirreke commented Aug 29, 2023

Could I update MSRV to 1.65.0? (Because nix has updated it to 1.65.0)

@ryankurte
Copy link

Could I update MSRV to 1.65.0? (Because nix has updated it to 1.65.0)

looks like we're still pulling in nix@0.23 here and in linux-embedded-hal? in principle we can update this to 0.27 and increase the MSRV to match, with the caveat we will also need to bump this upstream and in the other linux packages.

rust 1.65.0 is ~10 months old so that seems okay to me, any other takes @rust-embedded/embedded-hal folks?

@Dirreke
Copy link
Contributor Author

Dirreke commented Aug 30, 2023 •
edited
Loading

I originally planned to update dependencies in # 72. However it seems that the old nix is not supported for these new target. So I will merge #72 with this PR. And I will update MSRV to 1.65.0.

Close #72

@Dirreke Dirreke force-pushed the fix-ci branch 3 times, most recently from 62fc591 to 06ee939 Compare August 31, 2023 03:09
@Dirreke
Copy link
Contributor Author

Dirreke commented Aug 31, 2023

fixed

@eldruin
Copy link
Member

eldruin commented Sep 4, 2023 •
edited
Loading

Thank you!
I think 1.65.0 is probably fine for linux-embedded-hal.
Could you look at the failures in CI?

@Dirreke
Copy link
Contributor Author

Dirreke commented Sep 4, 2023

I mistakenly introduce some code only available in version 1.66.0 and above.

I fixed it, let's give it another try, Thanks

eldruin
eldruin reviewed Sep 6, 2023
View reviewed changes
Copy link
Member

@eldruin eldruin left a comment

Choose a reason for hiding this comment

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

Thanks!
Could you add an entry to the changelog about the MSRV change and remove the bors.toml file?

@Dirreke
Copy link
Contributor Author

Dirreke commented Sep 6, 2023

Done!

@Dirreke
Copy link
Contributor Author

Dirreke commented Sep 7, 2023

Could you review it? @eldruin

eldruin
eldruin previously approved these changes Sep 7, 2023
View reviewed changes
Copy link
Member

@eldruin eldruin left a comment

Choose a reason for hiding this comment

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

Looks good to me, thanks!

@eldruin eldruin added this pull request to the merge queue Sep 7, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Sep 7, 2023
@eldruin eldruin added this pull request to the merge queue Sep 7, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Sep 7, 2023
@Dirreke
Copy link
Contributor Author

Dirreke commented Sep 7, 2023

any idea? @eldruin

@eldruin
Copy link
Member

eldruin commented Sep 7, 2023

No idea, all the checks pass. Somehow the merge queue seems not to receive the results.

eldruin
eldruin reviewed Sep 7, 2023
View reviewed changes
Copy link
Member

@eldruin eldruin left a comment

Choose a reason for hiding this comment

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

Ah, I have it now.
Could you replace the on:... at the beginning of the ci.yml with this?:

on:
  push: # Run CI for all branches except GitHub merge queue tmp branches
    branches-ignore:
    - "gh-readonly-queue/**"
  pull_request: # Run CI for PRs on any branch
  merge_group: # Run CI for the GitHub merge queue

@Dirreke
Copy link
Contributor Author

Dirreke commented Sep 7, 2023

Done! @eldruin

eldruin
eldruin approved these changes Sep 7, 2023
View reviewed changes
Copy link
Member

@eldruin eldruin left a comment

Choose a reason for hiding this comment

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

Alright, hopefully it works now. Thanks!

@eldruin eldruin added this pull request to the merge queue Sep 7, 2023
Merged via the queue into rust-embedded:master with commit 6e8a153 Sep 7, 2023
17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eldruin eldruin eldruin approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Fix CI
3 participants
@Dirreke @ryankurte @eldruin