From c85a1d5a5b76a9ec5542415ffbcbaf55a551fb0c Mon Sep 17 00:00:00 2001
From: clearloop <udtrokia@gmail.com>
Date: Tue, 15 Jun 2021 11:03:44 +0800
Subject: [PATCH] ci(cargo): use git cli and patch global git base url (#114)

* chore(cargo): use git cli

* chore(docker): ignore .cargo in docker env

* Squashed commit of the following:

commit 2b3c586559f7a2bccf05a489b9aa01a2b99cf22b
Author: Matthias Seitz <matthias.seitz@outlook.de>
Date:   Mon Jun 14 10:05:29 2021 +0200

    revert naming conventions

commit e0efb1c91ecaaed01e84dc90ad53645e20bceb1a
Author: Matthias Seitz <matthias.seitz@outlook.de>
Date:   Mon Jun 14 10:05:05 2021 +0200

    add license header

commit 94364b32bb11c615e73aedd303de5db6c70972fd
Author: Matthias Seitz <matthias.seitz@outlook.de>
Date:   Sat Jun 12 22:59:37 2021 +0200

    revert config name change

commit eeacea59e30a7747dbf365fcc5ca2b75f87234aa
Author: Matthias Seitz <matthias.seitz@outlook.de>
Date:   Sat Jun 12 22:59:12 2021 +0200

    revert new pallet balances types

commit c9323f08b1cc0ace643e1ad4ebdea0119dae4b81
Author: Matthias Seitz <matthias.seitz@outlook.de>
Date:   Sat Jun 12 22:58:53 2021 +0200

    update runtime

commit 254ca23b67a582bcd0d6ad39b4e6ea2523ba5a6c
Author: Matthias Seitz <matthias.seitz@outlook.de>
Date:   Sat Jun 12 22:58:20 2021 +0200

    switch to polkadot v0.9.4 branches

commit ea76fe60ad3bd5e2c029e551129cafc54a7d41fd
Author: Matthias Seitz <matthias.seitz@outlook.de>
Date:   Sat Jun 12 21:51:35 2021 +0200

    update chainlink

commit 0a895b5ff3d5e636d922461c74902b38ca27c024
Author: Matthias Seitz <matthias.seitz@outlook.de>
Date:   Sat Jun 12 11:59:02 2021 +0200

    add sp-runtime as optional dependency

commit c2374abaa9583d0416e8b3869181fb7e9094b459
Author: Matthias Seitz <matthias.seitz@outlook.de>
Date:   Fri Jun 11 16:41:36 2021 +0200

    update tests

commit 7e345eab85ed1621fb436d28aab71fe0393d095a
Author: Matthias Seitz <matthias.seitz@outlook.de>
Date:   Fri Jun 11 15:59:16 2021 +0200

    update to master

commit b964a20589f39af6fc01f83ad18a4b3b7851a145
Author: Matthias Seitz <matthias.seitz@outlook.de>
Date:   Fri Jun 11 12:47:47 2021 +0200

    use compact Cargo.toml fromat everywhere

commit 716db61f6666bb70d6c20ebd1424d9eef5d84a9e
Author: Matthias Seitz <matthias.seitz@outlook.de>
Date:   Fri Jun 11 11:27:21 2021 +0200

    update polkadot deps

commit 03e4dd50f6eebbdcbf923244e9e67d4bbed9463e
Author: Matthias Seitz <matthias.seitz@outlook.de>
Date:   Fri Jun 11 01:33:29 2021 +0200

    use chainlink master

commit 836241a26d65720ce5d0e773569cd6eb63e5370b
Author: Matthias Seitz <matthias.seitz@outlook.de>
Date:   Fri Jun 11 01:23:49 2021 +0200

    fix: breaking changes from latest relase branch

commit a167d16b67e4c4b42594586d36a54c501fa2e64d
Author: Matthias Seitz <matthias.seitz@outlook.de>
Date:   Fri Jun 11 01:22:31 2021 +0200

    chore(deps): use latest polkadot release branch

commit 845e6ae32abeaa5e2f63d24c936054f73985e7b8
Author: Matthias Seitz <matthias.seitz@outlook.de>
Date:   Thu Jun 10 21:32:02 2021 +0200

    chore(deps): update substrate cumulus polkadot deps

* ci(rustup): remove minimal profile

* ci(git): force replace paritytech// with paritytech/

* ci(cargo): use git cli

* ci(git): paritytech/ insteandof paritytech//

* ci(git): replace base url

* Revert "Squashed commit of the following:"

This reverts commit d222d244fe5f7f33b4779231f7a64d87b416bd65.

* chore(cargo): kill EOF
---
 .cargo/config.toml   | 2 ++
 .circleci/config.yml | 8 +++++---
 .dockerignore        | 1 +
 .gitignore           | 3 ---
 4 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 .cargo/config.toml

diff --git a/.cargo/config.toml b/.cargo/config.toml
new file mode 100644
index 0000000000..c91c3f38b7
--- /dev/null
+++ b/.cargo/config.toml
@@ -0,0 +1,2 @@
+[net]
+git-fetch-with-cli = true
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7f623b6589..4dfeb580d3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -18,7 +18,10 @@ commands:
     steps:
       - run:
           name: Download Substrate Dependencies
-          command: sudo apt-get update && sudo apt-get install -y git clang curl libssl-dev
+          command: |
+            sudo apt-get update \
+            && sudo apt-get install -y git clang curl libssl-dev \
+            && git config --global url."https://github.com/paritytech/".insteadOf https://github.com/paritytech//
   cargo_audit_setup:
     description: Install cargo-audit
     steps:
@@ -60,8 +63,7 @@ commands:
             curl https://sh.rustup.rs -sSf | sh -s -- -y \
             --default-toolchain "$RUSTC_TOOLCHAIN" \
             -c clippy rustfmt \
-            -t wasm32-unknown-unknown \
-            --profile minimal
+            -t wasm32-unknown-unknown
       - restore_cache:
           key: cargo-package-cache-{{ checksum "Cargo.lock" }}-{{ arch }}
       - sccache_setup
diff --git a/.dockerignore b/.dockerignore
index 796d5fbe18..b850a571a0 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,2 +1,3 @@
+/.cargo/config.toml
 /target
 /Dockerfile
diff --git a/.gitignore b/.gitignore
index edfb46c29b..acf8dc12c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,9 +6,6 @@
 
 .DS_Store
 
-# The cache for docker container dependency
-.cargo
-
 # The cache for chain data in container
 .local