From ff1b67e1219e84b5ef6eb353ce7dfdc856622634 Mon Sep 17 00:00:00 2001 From: AlexD10S Date: Fri, 10 May 2024 01:09:29 +0200 Subject: [PATCH] chore: ci for arch and redhat --- crates/pop-cli/src/commands/install/mod.rs | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/crates/pop-cli/src/commands/install/mod.rs b/crates/pop-cli/src/commands/install/mod.rs index 752d612c4..86ae82ad1 100644 --- a/crates/pop-cli/src/commands/install/mod.rs +++ b/crates/pop-cli/src/commands/install/mod.rs @@ -36,8 +36,6 @@ pub enum DEPENDENCIES { Openssl, #[strum(serialize = "openssl-devel")] OpenSslDevel, - #[strum(serialize = "openssl-1.0")] - Openssl1, #[strum(serialize = "pkg-config")] PkgConfig, #[strum(serialize = "protobuf")] @@ -134,11 +132,14 @@ async fn install_arch(skip_confirm: bool) -> anyhow::Result<()> { DEPENDENCIES::Git, DEPENDENCIES::Clang, DEPENDENCIES::Make, - DEPENDENCIES::Protobuf, - DEPENDENCIES::Openssl1, + DEPENDENCIES::Openssl, DEPENDENCIES::Rustup, ))? } + cmd("pacman", vec!["-Syu", "--needed", "--noconfirm", &DEPENDENCIES::Openssl.to_string()]) + .run()?; + cmd("export", vec!["OPENSSL_LIB_DIR='/usr/lib/openssl-1.0'"]).run()?; + cmd("export", vec!["OPENSSL_INCLUDE_DIR='/usr/include/openssl-1.0'"]).run()?; cmd( "pacman", vec![ @@ -149,13 +150,9 @@ async fn install_arch(skip_confirm: bool) -> anyhow::Result<()> { &DEPENDENCIES::Git.to_string(), &DEPENDENCIES::Clang.to_string(), &DEPENDENCIES::Make.to_string(), - &DEPENDENCIES::Protobuf.to_string(), - &DEPENDENCIES::Openssl1.to_string(), ], ) .run()?; - cmd("export", vec!["OPENSSL_LIB_DIR='/usr/lib/openssl-1.0'"]).run()?; - cmd("export", vec!["OPENSSL_INCLUDE_DIR='/usr/include/openssl-1.0'"]).run()?; Ok(()) }