Skip to content

Commit 4784e5d

Browse files
committed
Merge remote-tracking branch 'origin/kim/ci/skip-unity-external' into test-skip-unity-external
2 parents 46e44f6 + b4013eb commit 4784e5d

6 files changed

Lines changed: 17 additions & 26 deletions

File tree

.github/workflows/csharp-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,4 +142,4 @@ jobs:
142142
UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
143143
# Skip if this is an external contribution.
144144
# The license secrets will be empty, so the step would fail anyway.
145-
if: !github.event.pull_request.head.repo.fork
145+
if: ${{ !github.event.pull_request.head.repo.fork }}

Cargo.lock

Lines changed: 11 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ syntect = { version = "5.0.0", default-features = false, features = ["default-fa
257257
tabled = "0.14.0"
258258
tar = "0.4"
259259
tempdir = "0.3.7"
260-
tempfile = "3.8"
260+
tempfile = "3.20"
261261
termcolor = "1.2.0"
262262
thin-vec = "0.2.13"
263263
thiserror = "1.0.37"
@@ -293,7 +293,7 @@ windows-sys = "0.59"
293293
xdg = "2.5"
294294
tikv-jemallocator = { version = "0.6.0", features = ["profiling", "stats"] }
295295
tikv-jemalloc-ctl = { version = "0.6.0", features = ["stats"] }
296-
jemalloc_pprof = { version = "0.7", features = ["symbolize", "flamegraph"] }
296+
jemalloc_pprof = { version = "0.8", features = ["symbolize", "flamegraph"] }
297297
zstd-framed = { version = "0.1.1", features = ["tokio"] }
298298

299299
# Vendor the openssl we rely on, rather than depend on a

crates/core/src/db/relational_db.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1708,7 +1708,7 @@ pub mod tests_utils {
17081708
impl TempReplicaDir {
17091709
pub fn new() -> io::Result<Self> {
17101710
let dir = TempDir::with_prefix("stdb_test")?;
1711-
Ok(Self(ReplicaDir::from_path_unchecked(dir.into_path())))
1711+
Ok(Self(ReplicaDir::from_path_unchecked(dir.keep())))
17121712
}
17131713
}
17141714
impl Deref for TempReplicaDir {

crates/core/src/host/instance_env.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ mod test {
527527
/// An `InstanceEnv` requires a `DatabaseLogger`
528528
fn temp_logger() -> Result<DatabaseLogger> {
529529
let temp = TempDir::new()?;
530-
let path = ModuleLogsDir::from_path_unchecked(temp.into_path());
530+
let path = ModuleLogsDir::from_path_unchecked(temp.keep());
531531
let path = path.today();
532532
Ok(DatabaseLogger::open(path))
533533
}

crates/testing/src/sdk.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pub fn ensure_standalone_process() -> &'static SpacetimePaths {
2222
// TODO: This leaks the tempdir.
2323
// We need the tempdir to live for the duration of the process,
2424
// and all the options for post-`main` cleanup seem sketchy.
25-
.into_path();
25+
.keep();
2626
SpacetimePaths::from_root_dir(&RootDir(dir))
2727
});
2828

0 commit comments

Comments
 (0)