377de6afdc
We've had josh in here previously, but it was kind of immature back then. The repository looks much better now and I'd like to give it another try. Josh is a Rust project, the build here is done with naersk. Change-Id: I3731340d00ce1eb4cef55de114e1915579e47ef3 Reviewed-on: https://cl.tvl.fyi/c/depot/+/3017 Reviewed-by: lukegb <lukegb@tvl.fyi> Tested-by: BuildkiteCI
62 lines
2.4 KiB
Diff
62 lines
2.4 KiB
Diff
From 1b743ee032fe14836f8b8d49e512f67adfe2440b Mon Sep 17 00:00:00 2001
|
|
From: Vincent Ambo <tazjin@google.com>
|
|
Date: Thu, 15 Apr 2021 17:05:10 +0200
|
|
Subject: [PATCH] Pin git2 revision in Cargo.toml
|
|
|
|
---
|
|
Cargo.lock | 4 ++--
|
|
Cargo.toml | 2 +-
|
|
josh-proxy/Cargo.toml | 2 +-
|
|
3 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/Cargo.lock b/Cargo.lock
|
|
index 5ee1b34..50139e0 100644
|
|
--- a/Cargo.lock
|
|
+++ b/Cargo.lock
|
|
@@ -636,7 +636,7 @@ checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce"
|
|
[[package]]
|
|
name = "git2"
|
|
version = "0.13.17"
|
|
-source = "git+https://github.com/initcrash/git2-rs.git#758aab9fc08fa59b57b3968a2ef6f0901a2b7007"
|
|
+source = "git+https://github.com/initcrash/git2-rs.git?rev=758aab9fc08fa59b57b3968a2ef6f0901a2b7007#758aab9fc08fa59b57b3968a2ef6f0901a2b7007"
|
|
dependencies = [
|
|
"bitflags",
|
|
"libc",
|
|
@@ -1153,7 +1153,7 @@ checksum = "ba4aede83fc3617411dc6993bc8c70919750c1c257c6ca6a502aed6e0e2394ae"
|
|
[[package]]
|
|
name = "libgit2-sys"
|
|
version = "0.12.18+1.1.0"
|
|
-source = "git+https://github.com/initcrash/git2-rs.git#758aab9fc08fa59b57b3968a2ef6f0901a2b7007"
|
|
+source = "git+https://github.com/initcrash/git2-rs.git?rev=758aab9fc08fa59b57b3968a2ef6f0901a2b7007#758aab9fc08fa59b57b3968a2ef6f0901a2b7007"
|
|
dependencies = [
|
|
"cc",
|
|
"libc",
|
|
diff --git a/Cargo.toml b/Cargo.toml
|
|
index 4234701..4dcbcd6 100644
|
|
--- a/Cargo.toml
|
|
+++ b/Cargo.toml
|
|
@@ -15,7 +15,7 @@ members = ["josh-proxy", "josh-ui"]
|
|
[dependencies]
|
|
handlebars = "3.5"
|
|
#git2 = {version = "0.13", default-features = false}
|
|
-git2 = { git = "https://github.com/initcrash/git2-rs.git", default-features = false}
|
|
+git2 = { git = "https://github.com/initcrash/git2-rs.git", default-features = false, rev = "758aab9fc08fa59b57b3968a2ef6f0901a2b7007" }
|
|
#git2 = { path="../../git2-rs", default-features = false}
|
|
clap = "2"
|
|
tracing = "*"
|
|
diff --git a/josh-proxy/Cargo.toml b/josh-proxy/Cargo.toml
|
|
index 6d1c30d..680af88 100644
|
|
--- a/josh-proxy/Cargo.toml
|
|
+++ b/josh-proxy/Cargo.toml
|
|
@@ -20,7 +20,7 @@ hyper_cgi = "0.1"
|
|
hyper-staticfile = "*"
|
|
hyper-tls = "*"
|
|
toml = "0.5"
|
|
-git2 = { git = "https://github.com/initcrash/git2-rs.git", default-features = false}
|
|
+git2 = { git = "https://github.com/initcrash/git2-rs.git", default-features = false, rev = "758aab9fc08fa59b57b3968a2ef6f0901a2b7007" }
|
|
tracing = { version = "0.1", features = ["max_level_trace", "release_max_level_trace"] }
|
|
tracing-futures = "0.2"
|
|
tracing-subscriber = "0.2"
|
|
--
|
|
2.31.1.295.g9ea45b61b8-goog
|
|
|