Satisfy Linux multiarch Python tooling.
This commit is contained in:
@@ -46,6 +46,7 @@ case "$target" in
|
|||||||
# They are unrelated to the build, but make apt replace native Python
|
# They are unrelated to the build, but make apt replace native Python
|
||||||
# while resolving foreign-architecture development packages.
|
# while resolving foreign-architecture development packages.
|
||||||
sudo env DEBIAN_FRONTEND=noninteractive apt-get remove -y mercurial python3-importlib-metadata python3-jwt
|
sudo env DEBIAN_FRONTEND=noninteractive apt-get remove -y mercurial python3-importlib-metadata python3-jwt
|
||||||
|
install_packages python3 python3-typing-extensions
|
||||||
|
|
||||||
sudo dpkg --add-architecture amd64
|
sudo dpkg --add-architecture amd64
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -178,6 +178,7 @@ fn tagged_releases_are_built_and_packaged_with_rust_tools() {
|
|||||||
"gcc-x86-64-linux-gnu",
|
"gcc-x86-64-linux-gnu",
|
||||||
"Architectures: arm64",
|
"Architectures: arm64",
|
||||||
"remove -y mercurial python3-importlib-metadata python3-jwt",
|
"remove -y mercurial python3-importlib-metadata python3-jwt",
|
||||||
|
"install_packages python3 python3-typing-extensions",
|
||||||
] {
|
] {
|
||||||
assert!(
|
assert!(
|
||||||
linux_dependencies.contains(required),
|
linux_dependencies.contains(required),
|
||||||
@@ -194,6 +195,13 @@ fn tagged_releases_are_built_and_packaged_with_rust_tools() {
|
|||||||
cleanup < multiarch,
|
cleanup < multiarch,
|
||||||
"runner-only Python packages must be removed before enabling multiarch"
|
"runner-only Python packages must be removed before enabling multiarch"
|
||||||
);
|
);
|
||||||
|
let native_python = linux_dependencies
|
||||||
|
.find("install_packages python3 python3-typing-extensions")
|
||||||
|
.expect("native Python dependency setup");
|
||||||
|
assert!(
|
||||||
|
native_python < multiarch,
|
||||||
|
"native Python dependencies must be fixed before enabling multiarch"
|
||||||
|
);
|
||||||
|
|
||||||
let workspace_manifest = fs::read_to_string(workspace.join("Cargo.toml")).unwrap();
|
let workspace_manifest = fs::read_to_string(workspace.join("Cargo.toml")).unwrap();
|
||||||
let core_manifest = fs::read_to_string(workspace.join("crates/bds-core/Cargo.toml")).unwrap();
|
let core_manifest = fs::read_to_string(workspace.join("crates/bds-core/Cargo.toml")).unwrap();
|
||||||
|
|||||||
Reference in New Issue
Block a user