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: pin cross and rust versions #200

Merged
merged 3 commits into from
Jan 19, 2024
Merged

ci: pin cross and rust versions #200

merged 3 commits into from
Jan 19, 2024

Conversation

Mossaka
Copy link
Member

@Mossaka Mossaka commented Jan 18, 2024

This pull request includes updates to the Rust toolchain and the Makefile to ensure specific versions are used and to include new components and targets. The most important changes include updating the rust-toolchain.toml file to use Rust version 1.75.0 and updating the install-cross target in the Makefile to specify a specific commit when installing cross.

Signed-off-by: jiaxiao zhou <jiazho@microsoft.com>
Signed-off-by: jiaxiao zhou <jiazho@microsoft.com>
@Mossaka Mossaka closed this Jan 18, 2024
@Mossaka Mossaka reopened this Jan 18, 2024
@Mossaka Mossaka marked this pull request as draft January 18, 2024 19:36
@Mossaka
Copy link
Member Author

Mossaka commented Jan 19, 2024

Confirmed that an older cross image ghcr.io/cross-rs/x86_64-unknown-linux-musl:main@sha256:a8a5f982bca1a7c91227bb342749282a2eebc93daef16ce0 works. The newer image introduces the PIE build issue.

@Mossaka
Copy link
Member Author

Mossaka commented Jan 19, 2024

It looks like the enable-default-pie flag was removed in this PR.

@Mossaka
Copy link
Member Author

Mossaka commented Jan 19, 2024

cross-rs/cross#1418 this PR adds PIE back.

@Mossaka Mossaka closed this Jan 19, 2024
@Mossaka Mossaka reopened this Jan 19, 2024
Signed-off-by: jiaxiao zhou <jiazho@microsoft.com>
@Mossaka Mossaka marked this pull request as ready for review January 19, 2024 19:11
@Mossaka Mossaka requested a review from devigned January 19, 2024 19:11
Copy link
Member

@devigned devigned left a comment

Choose a reason for hiding this comment

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

Nice work locking in the version to avoid the PIE compilation issue.

@devigned devigned merged commit 75a43c9 into deislabs:main Jan 19, 2024
20 checks passed
@Mossaka
Copy link
Member Author

Mossaka commented Jan 19, 2024

Nice work locking in the version to avoid the PIE compilation issue.

Thanks! Just to clarify, locking in the version did not fix the PIE compilation issue. The fix was on upstream cross repo to enable PIE compilation in musl library.

Mossaka added a commit to radu-matei/containerd-wasm-shims that referenced this pull request Jan 23, 2024
* ci: pin cross and rust versions
* fixed the commit rev
* pin rust version to 1.75

Signed-off-by: jiaxiao zhou <jiazho@microsoft.com>
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.

None yet

2 participants