Point at patched libgit

.buildkite/pipeline.yaml

@@ -6,7 +6,7 @@
     platform: "linux"
   timeout_in_minutes: 60
   env:
-    DOCKER_IMAGE: "gcr.io/opensourcecoin/radicle-upstream:0.8.0"
+    DOCKER_IMAGE: "gcr.io/opensourcecoin/radicle-upstream:0.9.0"
     SHARED_MASTER_CACHE: true
   artifact_paths:
     - "dist/*.AppImage"

.github/workflows/build.yaml

@@ -10,7 +10,7 @@ jobs:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != 'radicle-dev/radicle-upstream'
     runs-on: ubuntu-latest
     container:
-      image: "gcr.io/opensourcecoin/radicle-upstream:0.8.0"
+      image: "gcr.io/opensourcecoin/radicle-upstream:0.9.0"
     steps:
       - uses: actions/checkout@master
       - name: Cache Yarn

Cargo.toml

@@ -3,3 +3,11 @@
 members = [
   "proxy/api",
 ]
+
+[patch.crates-io.git2]
+git = "https://github.com/radicle-dev/git2-rs.git"
+rev = "5971ca18d73eed39384193899177dfb7ac2d0a05"
+
+[patch.crates-io.libgit2-sys]
+git = "https://github.com/radicle-dev/git2-rs.git"
+rev = "5971ca18d73eed39384193899177dfb7ac2d0a05"

ci/Dockerfile

@@ -28,7 +28,7 @@ RUN set -eux; \
 
 # Rust toolchain
 # Make sure this is in sync with rust-toolchain!
-ENV RUST_VERSION=nightly-2021-03-25 \
+ENV RUST_VERSION=nightly-2021-05-09 \
     CARGO_HOME=/usr/local/cargo \
     PATH=/usr/local/cargo/bin:$PATH \
     RUSTUP_HOME=/usr/local/rustup \

proxy/api/Cargo.toml

@@ -40,11 +40,11 @@ warp = { version = "0.3", default-features = false }
 
 [dependencies.radicle-daemon]
 git = "https://github.com/radicle-dev/radicle-link.git"
-rev = "f9fa8303cd33096d7818f0dcb0a24d3a9f618fab"
+rev = "76e2bc2928185db996433acf53c007177a3a6605"
 
 [dependencies.radicle-git-ext]
 git = "https://github.com/radicle-dev/radicle-link.git"
-rev = "f9fa8303cd33096d7818f0dcb0a24d3a9f618fab"
+rev = "76e2bc2928185db996433acf53c007177a3a6605"
 
 [dependencies.radicle-avatar]
 git = "https://github.com/radicle-dev/radicle-avatar.git"

proxy/api/src/control.rs

@@ -95,7 +95,7 @@ pub fn push_tags(
         .tag_names(None)?
         .into_iter()
         .flatten()
-        .flat_map(|tag| Pushspec::from_str(&format!("+refs/tags/{}:refs/tags/{}", tag, tag)).ok())
+        .filter_map(|tag| Pushspec::from_str(&format!("+refs/tags/{}:refs/tags/{}", tag, tag)).ok())
         .collect::<Vec<_>>();
     let tags = NonEmpty::from_vec(tags);
 

proxy/api/src/env.rs

@@ -15,7 +15,7 @@ fn test_set_if_unset() {
     const KEY: &str = "DUMMY_VALUE";
     const VALUE: &str = "hello world";
 
-    assert_eq!(var(KEY).is_err(), true, "DUMMY_VALUE should be unset");
+    assert!(var(KEY).is_err(), "DUMMY_VALUE should be unset");
     set_if_unset(KEY, VALUE);
     assert_eq!(var(KEY), Ok(VALUE.to_string()));
 }

proxy/api/src/http/source.rs

@@ -331,6 +331,7 @@ mod test {
 
     use crate::{browser, context, error, http};
 
+    #[allow(clippy::too_many_lines)]
     #[tokio::test]
     async fn blob() -> Result<(), Box<dyn std::error::Error>> {
         let tmp_dir = tempfile::tempdir()?;

proxy/api/src/lib.rs

@@ -21,7 +21,7 @@
     clippy::multiple_crate_versions,
     clippy::or_fun_call,
     clippy::shadow_reuse,
-    clippy::clippy::option_if_let_else,
+    clippy::option_if_let_else,
     clippy::similar_names,
     clippy::large_types_passed_by_value
 )]

proxy/api/src/notification.rs

@@ -24,7 +24,7 @@ pub enum Notification {
 }
 
 /// Event observed about the local peer.
-#[allow(clippy::clippy::large_enum_variant)]
+#[allow(clippy::large_enum_variant)]
 #[derive(Clone, Debug, Serialize)]
 #[serde(rename_all = "camelCase", tag = "type")]
 pub enum LocalPeer {

proxy/api/src/process.rs

@@ -43,7 +43,7 @@ struct Rigging {
     /// The context provided to the API
     ctx: context::Context,
     /// The [`Peer`] to run
-    peer: Option<Peer<radicle_daemon::config::StreamDiscovery>>,
+    peer: Option<Peer<signer::BoxedSigner, radicle_daemon::config::StreamDiscovery>>,
     /// Channel to receive updates to the seed nodes from the API
     seeds_sender: Option<watch::Sender<Vec<seed::Seed>>>,
 }

proxy/api/src/service.rs

@@ -129,7 +129,7 @@ impl Manager {
 }
 
 /// Messages that are sent from [`Handle`] to [`Manager`] to change the service environment.
-#[allow(clippy::clippy::large_enum_variant)]
+#[allow(clippy::large_enum_variant)]
 enum Message {
     /// Reset the service to the initial environment and delete all persisted state
     Reset,

rust-toolchain

@@ -1 +1 @@
-nightly-2021-03-25
+nightly-2021-05-09