Skip to content

Commit

Permalink
Investigate error in CI testing
Browse files Browse the repository at this point in the history
  • Loading branch information
vrmiguel committed Mar 10, 2025
1 parent 1319b35 commit 6db1008
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ jobs:
USER=$(whoami)
sudo chown -R $USER $(pg_config --sharedir)
sudo chown -R $USER $(pg_config --pkglibdir)
which pg_config
ls -lah $(pg_config --sharedir)
ls -lah $(pg_config --pkglibdir)
true && echo "done!"
cargo test -- --nocapture
cargo_publish:
Expand Down
17 changes: 7 additions & 10 deletions cli/src/commands/install.rs
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,11 @@ pub struct InstallCommand {

impl InstallCommand {
pub fn pgconfig(&self) -> Result<PgConfig> {
let pg_config_path = self
.pg_config
.clone()
let pg_config_path = dbg!(self.pg_config.clone())
.map(Ok)
.unwrap_or_else(|| which::which("pg_config"))?;
.unwrap_or_else(|| dbg!(which::which("pg_config")))?;

dbg!(&pg_config_path);

Ok(PgConfig { pg_config_path })
}
Expand All @@ -108,9 +108,7 @@ pub struct PgConfig {

impl PgConfig {
fn exec(&self, arg: &str) -> Result<String> {
use std::process::Command;

let mut bytes = Command::new(&self.pg_config_path)
let mut bytes = std::process::Command::new(&self.pg_config_path)
.arg(arg)
.output()
.with_context(|| format!("Failed to run pgconfig {arg}"))?
Expand Down Expand Up @@ -477,8 +475,8 @@ async fn install_trunk_archive(
config: InstallConfig,
) -> Result<()> {
// Handle symlinks
let sharedir = std::fs::canonicalize(&config.sharedir)?;
let package_lib_dir = std::fs::canonicalize(&config.package_lib_dir)?;
let sharedir = dbg!(std::fs::canonicalize(&config.sharedir))?;
let package_lib_dir = dbg!(std::fs::canonicalize(&config.package_lib_dir))?;

// First pass: get to the manifest
// Because we're going over entries with `Seek` enabled, we're not reading everything.
Expand Down Expand Up @@ -799,7 +797,6 @@ async fn install_with_system_dependencies() -> Result<()> {
)
.await?;

dbg!(mockcmd::get_executed_commands());
let system_deps = [
"libpq5", "openssl", "libc6", "liblz4-1", "libzstd1", "libssl3", "libcurl4",
];
Expand Down

0 comments on commit 6db1008

Please sign in to comment.