From 7a479b1896d3957b8730aa219df7fecd9fdd4675 Mon Sep 17 00:00:00 2001
From: Stephan Dilly <dilly.stephan@gmail.com>
Date: Thu, 16 Apr 2020 13:03:55 +0200
Subject: [PATCH] reduce git2 features and add musl build step

fix tabs

integrate linux musl builds in CD pipeline
---
 .github/workflows/cd.yml |  9 ++++++++-
 .github/workflows/ci.yml | 14 ++++++++++++++
 Cargo.lock               | 37 -------------------------------------
 Makefile                 |  9 +++++----
 asyncgit/Cargo.toml      |  2 +-
 5 files changed, 28 insertions(+), 43 deletions(-)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index cb72e4a0..e2dc7797 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -23,13 +23,19 @@ jobs:
       run: make test
     - name: Run clippy
       run: make clippy
+
+    - name: Setup MUSL
+      if: matrix.os == 'ubuntu-latest'
+      run: |
+        rustup target add x86_64-unknown-linux-musl
+        sudo apt-get -qq install musl-tools
       
     - name: Build Release Mac
       if: matrix.os == 'macos-latest'
       run: make release-mac
     - name: Build Release Linux
       if: matrix.os == 'ubuntu-latest'
-      run: make release-linux
+      run: make release-linux-musl
 
     - name: Set SHA
       if: matrix.os == 'macos-latest'
@@ -44,6 +50,7 @@ jobs:
         prerelease: true
         files: |
           ./release/*.tar.gz
+          ./release/*.zip
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3c0399ad..5dd580d7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,6 +28,20 @@ jobs:
     - name: Build Release
       run: make build-release
 
+  build-linux-musl:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Setup MUSL
+      run: |
+        rustup target add x86_64-unknown-linux-musl
+        sudo apt-get -qq install musl-tools
+    - name: Build Debug
+      run: cargo build --target=x86_64-unknown-linux-musl
+    - name: Build Release
+      run: |
+        cargo build --release --target=x86_64-unknown-linux-musl
+
   rustfmt:
     name: Rustfmt
     runs-on: ubuntu-latest
diff --git a/Cargo.lock b/Cargo.lock
index 4ba9f8e2..40fd9802 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -276,8 +276,6 @@ dependencies = [
  "libc",
  "libgit2-sys",
  "log",
- "openssl-probe",
- "openssl-sys",
  "url",
 ]
 
@@ -386,26 +384,10 @@ checksum = "7637dc15e7f05a16011723e0448655081fc01a374bcd368e2c9b9c7f5c5ab3ea"
 dependencies = [
  "cc",
  "libc",
- "libssh2-sys",
  "libz-sys",
- "openssl-sys",
  "pkg-config",
 ]
 
-[[package]]
-name = "libssh2-sys"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bb70f29dc7c31d32c97577f13f41221af981b31248083e347b7f2c39225a6bc"
-dependencies = [
- "cc",
- "libc",
- "libz-sys",
- "openssl-sys",
- "pkg-config",
- "vcpkg",
-]
-
 [[package]]
 name = "libz-sys"
 version = "1.0.25"
@@ -528,25 +510,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "openssl-probe"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
-
-[[package]]
-name = "openssl-sys"
-version = "0.9.54"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1024c0a59774200a555087a6da3f253a9095a5f344e353b212ac4c8b8e450986"
-dependencies = [
- "autocfg",
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
 [[package]]
 name = "parking_lot"
 version = "0.10.0"
diff --git a/Makefile b/Makefile
index 8463c84c..bb3fa561 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 
-.PHONY: test
+.PHONY: debug build-release release-linux-musl test clippy clippy-pedantic install install-debug
 
 debug:
 	GITUI_LOGGING=true cargo run --features=timing
@@ -12,10 +12,11 @@ release-mac: build-release
 	mkdir -p release
 	tar -C ./target/release/ -czvf ./release/gitui-mac.tar.gz ./gitui
 
-release-linux: build-release
-	strip target/release/gitui
+release-linux-musl: 
+	cargo build --release --target=x86_64-unknown-linux-musl
+	strip target/x86_64-unknown-linux-musl/release/gitui
 	mkdir -p release
-	tar -C ./target/release/ -czvf ./release/gitui-linux.tar.gz ./gitui
+	tar -C ./target/x86_64-unknown-linux-musl/release/ -czvf ./release/gitui-linux-musl.tar.gz ./gitui
 
 test:
 	cargo test --workspace
diff --git a/asyncgit/Cargo.toml b/asyncgit/Cargo.toml
index 71ca8993..2ffc154e 100644
--- a/asyncgit/Cargo.toml
+++ b/asyncgit/Cargo.toml
@@ -10,7 +10,7 @@ license = "MIT"
 categories = ["concurrency","asynchronous"]
 
 [dependencies]
-git2 = "0.13.2"
+git2 = { version = "0.13.2", default-features = false }
 rayon-core = "1.7"
 crossbeam-channel = "0.4"
 log = "0.4"