Add additional ARM targets to release #2417
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This will take some trial and error. |
charliermarsh
force-pushed
the
charlie/arm
branch
7 times, most recently
from
961ca84
to
b75959c
Compare
charliermarsh
added
the
releases
charliermarsh
force-pushed
the
charlie/arm
branch
21 times, most recently
from
0924efa
to
791d697
Compare
charliermarsh
force-pushed
the
charlie/arm
branch
7 times, most recently
from
1d92264
to
33a58b3
Compare
charliermarsh
commented
Mar 14, 2024
| @@ -534,8 +540,6 @@ jobs: | |||
| - target: aarch64-unknown-linux-musl | |||
| arch: aarch64 | |||
| maturin_docker_options: -e JEMALLOC_SYS_WITH_LG_PAGE=16 | |||
| - target: armv7-unknown-linux-musleabihf | |||
| arch: armv7 | |||
There was a problem hiding this comment.
Should we build this here, or in the linux-arm category that I augmented above?
charliermarsh
force-pushed
the
charlie/arm
branch
from
53a217b
to
7971c67
Compare
charliermarsh
commented
Mar 14, 2024
crates/platform-tags/src/platform.rs
Outdated
| @@ -107,6 +109,8 @@ impl Arch { | |||
| Self::Aarch64 | Self::Armv7L | Self::Powerpc64 | Self::Powerpc64Le | Self::S390X => 17, | |||
| // manylinux 1 | |||
| Self::X86 | Self::X86_64 => 5, | |||
| // not supported | |||
| Self::Armv6L => 0, | |||
There was a problem hiding this comment.
@konstin - This is a bit awkward
There was a problem hiding this comment.
What about
diff --git a/crates/platform-tags/src/platform.rs b/crates/platform-tags/src/platform.rs
index c28e9b76..d36c91e9 100644
--- a/crates/platform-tags/src/platform.rs
+++ b/crates/platform-tags/src/platform.rs
@@ -103,14 +103,16 @@ impl fmt::Display for Arch {
impl Arch {
/// Returns the oldest possible Manylinux tag for this architecture
- pub fn get_minimum_manylinux_minor(&self) -> u16 {
+ pub fn get_minimum_manylinux_minor(&self) -> Option<u16> {
match self {
// manylinux 2014
- Self::Aarch64 | Self::Armv7L | Self::Powerpc64 | Self::Powerpc64Le | Self::S390X => 17,
+ Self::Aarch64 | Self::Armv7L | Self::Powerpc64 | Self::Powerpc64Le | Self::S390X => {
+ Some(17)
+ }
// manylinux 1
- Self::X86 | Self::X86_64 => 5,
+ Self::X86 | Self::X86_64 => Some(5),
// not supported
- Self::Armv6L => 0,
+ Self::Armv6L => None,
}
}
}
diff --git a/crates/platform-tags/src/tags.rs b/crates/platform-tags/src/tags.rs
index b4db57da..3cd9a2db 100644
--- a/crates/platform-tags/src/tags.rs
+++ b/crates/platform-tags/src/tags.rs
@@ -336,18 +336,19 @@ fn compatible_tags(platform: &Platform) -> Result<Vec<String>, PlatformError> {
let platform_tags = match (&os, arch) {
(Os::Manylinux { major, minor }, _) => {
let mut platform_tags = vec![format!("linux_{}", arch)];
- platform_tags.extend(
- (arch.get_minimum_manylinux_minor()..=*minor)
- .map(|minor| format!("manylinux_{major}_{minor}_{arch}")),
- );
- if (arch.get_minimum_manylinux_minor()..=*minor).contains(&12) {
- platform_tags.push(format!("manylinux2010_{arch}"));
- }
- if (arch.get_minimum_manylinux_minor()..=*minor).contains(&17) {
- platform_tags.push(format!("manylinux2014_{arch}"));
- }
- if (arch.get_minimum_manylinux_minor()..=*minor).contains(&5) {
- platform_tags.push(format!("manylinux1_{arch}"));
+ if let Some(min_minor) = arch.get_minimum_manylinux_minor() {
+ platform_tags.extend(
+ (min_minor..=*minor).map(|minor| format!("manylinux_{major}_{minor}_{arch}")),
+ );
+ if (min_minor..=*minor).contains(&12) {
+ platform_tags.push(format!("manylinux2010_{arch}"));
+ }
+ if (min_minor..=*minor).contains(&17) {
+ platform_tags.push(format!("manylinux2014_{arch}"));
+ }
+ if (min_minor..=*minor).contains(&5) {
+ platform_tags.push(format!("manylinux1_{arch}"));
+ }
}
platform_tags
}
I saw this PR and thought that it can be supported directly in maturin-action. |
|
@messense - Thank you very much. |
messense
reviewed
Mar 15, 2024
konstin
approved these changes
Mar 15, 2024
crates/platform-tags/src/platform.rs
Outdated
| @@ -107,6 +109,8 @@ impl Arch { | |||
| Self::Aarch64 | Self::Armv7L | Self::Powerpc64 | Self::Powerpc64Le | Self::S390X => 17, | |||
| // manylinux 1 | |||
| Self::X86 | Self::X86_64 => 5, | |||
| // not supported | |||
| Self::Armv6L => 0, | |||
There was a problem hiding this comment.
What about
diff --git a/crates/platform-tags/src/platform.rs b/crates/platform-tags/src/platform.rs
index c28e9b76..d36c91e9 100644
--- a/crates/platform-tags/src/platform.rs
+++ b/crates/platform-tags/src/platform.rs
@@ -103,14 +103,16 @@ impl fmt::Display for Arch {
impl Arch {
/// Returns the oldest possible Manylinux tag for this architecture
- pub fn get_minimum_manylinux_minor(&self) -> u16 {
+ pub fn get_minimum_manylinux_minor(&self) -> Option<u16> {
match self {
// manylinux 2014
- Self::Aarch64 | Self::Armv7L | Self::Powerpc64 | Self::Powerpc64Le | Self::S390X => 17,
+ Self::Aarch64 | Self::Armv7L | Self::Powerpc64 | Self::Powerpc64Le | Self::S390X => {
+ Some(17)
+ }
// manylinux 1
- Self::X86 | Self::X86_64 => 5,
+ Self::X86 | Self::X86_64 => Some(5),
// not supported
- Self::Armv6L => 0,
+ Self::Armv6L => None,
}
}
}
diff --git a/crates/platform-tags/src/tags.rs b/crates/platform-tags/src/tags.rs
index b4db57da..3cd9a2db 100644
--- a/crates/platform-tags/src/tags.rs
+++ b/crates/platform-tags/src/tags.rs
@@ -336,18 +336,19 @@ fn compatible_tags(platform: &Platform) -> Result<Vec<String>, PlatformError> {
let platform_tags = match (&os, arch) {
(Os::Manylinux { major, minor }, _) => {
let mut platform_tags = vec![format!("linux_{}", arch)];
- platform_tags.extend(
- (arch.get_minimum_manylinux_minor()..=*minor)
- .map(|minor| format!("manylinux_{major}_{minor}_{arch}")),
- );
- if (arch.get_minimum_manylinux_minor()..=*minor).contains(&12) {
- platform_tags.push(format!("manylinux2010_{arch}"));
- }
- if (arch.get_minimum_manylinux_minor()..=*minor).contains(&17) {
- platform_tags.push(format!("manylinux2014_{arch}"));
- }
- if (arch.get_minimum_manylinux_minor()..=*minor).contains(&5) {
- platform_tags.push(format!("manylinux1_{arch}"));
+ if let Some(min_minor) = arch.get_minimum_manylinux_minor() {
+ platform_tags.extend(
+ (min_minor..=*minor).map(|minor| format!("manylinux_{major}_{minor}_{arch}")),
+ );
+ if (min_minor..=*minor).contains(&12) {
+ platform_tags.push(format!("manylinux2010_{arch}"));
+ }
+ if (min_minor..=*minor).contains(&17) {
+ platform_tags.push(format!("manylinux2014_{arch}"));
+ }
+ if (min_minor..=*minor).contains(&5) {
+ platform_tags.push(format!("manylinux1_{arch}"));
+ }
}
platform_tags
}
charliermarsh
force-pushed
the
charlie/arm
branch
from
918c2c5
to
9b6b8e0
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #2415.
Closes #2416.