Skip to content

Update CI#26

Merged
cr1901 merged 3 commits intorust-embedded:masterfrom
RossPorter506:test-ci
Jul 25, 2025
Merged

Update CI#26
cr1901 merged 3 commits intorust-embedded:masterfrom
RossPorter506:test-ci

Conversation

@RossPorter506
Copy link
Contributor

Fixes the broken CI, and accepts minor changes to error outputs that have occurred while the CI has been broken.

The macro workspace inherited the msp430-none-elf target from .cargo/config.toml, which caused some issues. To get around this we override that by invoking the test suite with --target=x86_64-unknown-linux-gnu so the trybuild runner gets built on the host architecture. Then, to ensure the tests themselves compile as msp430 binaries we have to fiddle with environment variables in the test runner so the tests are correctly built targetting the msp430 (and build-std is correctly passed through).

trybuild didn't like being run as an msp43-none-elf target, so we have to run the test with --target x86 to overrule the .cargo/config rule, then in the test harness set environment flags back to targetting the msp430, so when trybuild compiles the examples they're successfully built as msp430 binaries.
Copy link
Contributor

@cr1901 cr1901 left a comment

Choose a reason for hiding this comment

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

https://github.com/rust-embedded/msp430-rt/pull/26/files#diff-427a44ca781c56cac3732330bff8f73bec069e54f1888c97703076f3349a290cR8

The runs-on line needs to be changed to a more recent Ubuntu version. After that's fixed, I will approve.

@RossPorter506
Copy link
Contributor Author

RossPorter506 commented Jul 25, 2025

Ah right, I had done all my testing on a self-hosted runner. I've set it as ubuntu-latest now, let me know if you want it pinned to a particular version like 24.04 instead.

@cr1901
Copy link
Contributor

cr1901 commented Jul 25, 2025

ubuntu-latest will be fine. I'm a bit fried, so I'm gonna go ahead and merge this. I'll defer figuring out why those environment variables in compiletest.rs are required until later.

@cr1901 cr1901 merged commit e90a618 into rust-embedded:master Jul 25, 2025
1 check passed
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.

2 participants