Skip to content

Commit cb261c6

Browse files
committed
fix(ci): harden e2e cleanup paths
Signed-off-by: Alexander Watson <zredlined@gmail.com>
1 parent 4e25ac7 commit cb261c6

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

.github/workflows/e2e-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ jobs:
8989
chown openshell-test: "/run/user/$(id -u openshell-test)"
9090
chmod 700 "/run/user/$(id -u openshell-test)"
9191
chown -R openshell-test: .
92-
mkdir -p /home/openshell-test/.cache/mise /home/openshell-test/.local/state/mise
93-
chown -R openshell-test: /home/openshell-test/.cache /home/openshell-test/.local
92+
mkdir -p /home/openshell-test/.cache/mise /home/openshell-test/.cargo /home/openshell-test/.local/state/mise
93+
chown -R openshell-test: /home/openshell-test/.cache /home/openshell-test/.cargo /home/openshell-test/.local
9494
install -m 0755 "$(command -v mise)" /usr/local/bin/mise
9595
chmod a+x /root /root/.local /root/.local/bin
9696
for dir in /root/.cargo /root/.rustup /root/.local/share/mise /opt/mise; do
@@ -112,7 +112,7 @@ jobs:
112112
XDG_RUNTIME_DIR="/run/user/${TESTUID}" \
113113
HOME="/home/openshell-test" \
114114
PATH="/usr/local/bin:/root/.cargo/bin:/opt/mise/shims:/root/.local/bin:${PATH}" \
115-
CARGO_HOME="/root/.cargo" \
115+
CARGO_HOME="/home/openshell-test/.cargo" \
116116
RUSTUP_HOME="/root/.rustup" \
117117
MISE_DATA_DIR="/opt/mise" \
118118
MISE_CACHE_DIR="/home/openshell-test/.cache/mise" \

crates/openshell-server/src/compute/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -507,6 +507,8 @@ impl ComputeRuntime {
507507
}
508508

509509
pub async fn delete_sandbox(&self, name: &str) -> Result<bool, Status> {
510+
let _guard = self.sync_lock.lock().await;
511+
510512
// Resolve sandbox ID from name
511513
let sandbox = self
512514
.store

0 commit comments

Comments
 (0)