Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pull in tar-rs fork to work around startup issue. #378

Merged
merged 2 commits into from
May 18, 2023
Merged

Pull in tar-rs fork to work around startup issue. #378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae6c69b
Pull in tar-rs fork to work around startup issue.
obmarg May 17, 2023
eb9e17e
Fix silly mistake
obmarg May 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions cli/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion cli/crates/server/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ sqlx = { version = "0.6", features = [
strip-ansi-escapes = "0.1"
strum = { version = "0.24", features = ["derive"] }
tantivy = { version = "0.19", default-features = false }
tar = "0.4"
# Temporary change till https://github.com/alexcrichton/tar-rs/pull/319 is release
tar = { git = "https://github.com/obmarg/tar-rs.git", rev = "bffee32190d531c03d806680daebd89cb1544be1" }
tempfile = "3"
thiserror = "1"
tokio = { version = "1", features = ["full"] }
Expand Down
4 changes: 2 additions & 2 deletions cli/crates/server/src/servers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,8 +331,8 @@ fn export_embedded_files() -> Result<(), ServerError> {
let reader = GzDecoder::new(ASSETS_GZIP);
let mut archive = tar::Archive::new(reader);
let full_path = &environment.user_dot_grafbase_path;
fs::create_dir_all(full_path)
.and_then(|_| archive.unpack(full_path))
archive
.unpack(full_path)
.map_err(|_| ServerError::WriteFile(full_path.to_string_lossy().into_owned()))?;

if fs::write(&version_path, current_version).is_err() {
Expand Down
Loading