Skip to content

Commit 862ff76

Browse files
committed
Investigate error in CI testing
1 parent 1319b35 commit 862ff76

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

Diff for: .github/workflows/cli.yml

+3
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ jobs:
7070
USER=$(whoami)
7171
sudo chown -R $USER $(pg_config --sharedir)
7272
sudo chown -R $USER $(pg_config --pkglibdir)
73+
touch $(pg_config --sharedir) && echo "touched sharedir"
74+
touch $(pg_config --pkglibdir) && echo "touched pkglibdir"
75+
true && echo "done!"
7376
cargo test -- --nocapture
7477
7578
cargo_publish:

Diff for: cli/src/commands/install.rs

+6-7
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,9 @@ impl InstallCommand {
8181
.pg_config
8282
.clone()
8383
.map(Ok)
84-
.unwrap_or_else(|| which::which("pg_config"))?;
84+
.unwrap_or_else(|| dbg!(which::which("pg_config")))?;
85+
86+
dbg!(&pg_config_path);
8587

8688
Ok(PgConfig { pg_config_path })
8789
}
@@ -108,9 +110,7 @@ pub struct PgConfig {
108110

109111
impl PgConfig {
110112
fn exec(&self, arg: &str) -> Result<String> {
111-
use std::process::Command;
112-
113-
let mut bytes = Command::new(&self.pg_config_path)
113+
let mut bytes = std::process::Command::new(&self.pg_config_path)
114114
.arg(arg)
115115
.output()
116116
.with_context(|| format!("Failed to run pgconfig {arg}"))?
@@ -477,8 +477,8 @@ async fn install_trunk_archive(
477477
config: InstallConfig,
478478
) -> Result<()> {
479479
// Handle symlinks
480-
let sharedir = std::fs::canonicalize(&config.sharedir)?;
481-
let package_lib_dir = std::fs::canonicalize(&config.package_lib_dir)?;
480+
let sharedir = dbg!(std::fs::canonicalize(&config.sharedir))?;
481+
let package_lib_dir = dbg!(std::fs::canonicalize(&config.package_lib_dir))?;
482482

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

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

0 commit comments

Comments
 (0)