fix: rename env variables (remained after the project was renamed)

This commit is contained in:
2026-09-07 02:46:44 +05:00
parent 97eea5e064
commit d194890315
4 changed files with 17 additions and 17 deletions
+3 -3
View File
@@ -107,14 +107,14 @@ remote.commands = ["pm2 restart pages"]
[projects.my-node-app.local_after]
commands = [
'del /q dist',
'curl -s -X POST https://example.com/hook -d "result=%XBP_DEPLOY_RESULT%"',
'curl -s -X POST https://example.com/hook -d "result=%XD_DEPLOY_RESULT%"',
]
```
Внутри доступны переменные (в cmd — `%VAR%`, в sh — `$VAR`):
- `XBP_DEPLOY_RESULT``success` либо `failed`;
- `XBP_ERROR` — текст ошибки (только при `failed`).
- `XD_DEPLOY_RESULT``success` либо `failed`;
- `XD_ERROR` — текст ошибки (только при `failed`).
Эти же переменные доступны в `--dry-run`, где показываются в плане без
выполнения.
+2 -2
View File
@@ -381,7 +381,7 @@ hostt = "typo"
host = "10.0.0.9"
port = 2327
user = "deploy"
key_path = "~/.ssh/xbp_key"
key_path = "~/.ssh/xd_key"
[projects.web]
workdir = "."
@@ -401,7 +401,7 @@ port = 2222
assert_eq!(web.port, Some(2327));
assert_eq!(web.user.as_deref(), Some("deploy"));
let key = web.key_path.as_ref().unwrap();
assert!(key.ends_with("xbp_key"), "{}", key.display());
assert!(key.ends_with("xd_key"), "{}", key.display());
}
#[test]
+5 -5
View File
@@ -132,11 +132,11 @@ fn run_local_after(project: &Project, primary: &Result<()>) -> Result<()> {
let mut env = project.env.clone();
match primary {
Ok(()) => {
env.insert("XBP_DEPLOY_RESULT".to_string(), "success".to_string());
env.insert("XD_DEPLOY_RESULT".to_string(), "success".to_string());
}
Err(err) => {
env.insert("XBP_DEPLOY_RESULT".to_string(), "failed".to_string());
env.insert("XBP_ERROR".to_string(), format!("{err:#}"));
env.insert("XD_DEPLOY_RESULT".to_string(), "failed".to_string());
env.insert("XD_ERROR".to_string(), format!("{err:#}"));
}
}
for cmd in &cmds.commands {
@@ -315,9 +315,9 @@ mod tests {
fn result_echo_cmd(out: &Path) -> String {
if cfg!(windows) {
format!("echo %XBP_DEPLOY_RESULT%> {}", out.display())
format!("echo %XD_DEPLOY_RESULT%> {}", out.display())
} else {
format!("echo $XBP_DEPLOY_RESULT > {}", out.display())
format!("echo $XD_DEPLOY_RESULT > {}", out.display())
}
}
+7 -7
View File
@@ -212,11 +212,11 @@ mod tests {
fn env_vars_visible_inside_local_commands() {
let workdir = tmpdir("dotenv-exec");
let echo_var = if cfg!(windows) {
"echo %XBP_TEST_VAR%"
"echo %XD_TEST_VAR%"
} else {
"echo $XBP_TEST_VAR"
"echo $XD_TEST_VAR"
};
fs::write(workdir.join(".env"), "XBP_TEST_VAR=hello-env\n").unwrap();
fs::write(workdir.join(".env"), "XD_TEST_VAR=hello-env\n").unwrap();
let mut command = shell_command(echo_var);
command.current_dir(&workdir);
for (k, v) in load_dotenv(&workdir).unwrap() {
@@ -233,13 +233,13 @@ mod tests {
fn config_env_overrides_dotenv() {
let workdir = tmpdir("dotenv-precedence");
let echo_var = if cfg!(windows) {
"echo %XBP_P_VAR%"
"echo %XD_P_VAR%"
} else {
"echo $XBP_P_VAR"
"echo $XD_P_VAR"
};
fs::write(workdir.join(".env"), "XBP_P_VAR=from-dotenv\n").unwrap();
fs::write(workdir.join(".env"), "XD_P_VAR=from-dotenv\n").unwrap();
let mut extra = BTreeMap::new();
extra.insert("XBP_P_VAR".to_string(), "from-config".to_string());
extra.insert("XD_P_VAR".to_string(), "from-config".to_string());
let mut command = shell_command(echo_var);
command.current_dir(&workdir);
for (k, v) in load_dotenv(&workdir).unwrap() {