fix openssl vendoring with new resolver (#775)

* run otool in ci
* pin openssl-sys with 'vendored' feature

Author: Stephan Dilly

.github/workflows/cd.yml

@@ -28,7 +28,6 @@ jobs:
         components: clippy
 
     - name: New Resolver
-      if: matrix.rust != '1.50'
       run: |
         cargo install cargo-modify --force
         cargo modify new-resolver

.github/workflows/ci.yml

@@ -78,6 +78,11 @@ jobs:
       run: |
         ls -l ./target/release/gitui.exe
 
+    - name: Binary dependencies (mac)
+      if: matrix.os == 'macos-latest'
+      run: |
+        otool -L ./target/release/gitui
+
     - name: Build MSI (windows)
       if: matrix.os == 'windows-latest'
       run: |

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## Fixed
+- openssl vendoring broken on macos ([#772](https://github.com/extrawurst/gitui/issues/772))
+
 ## [0.16.1] - 2021-06-06
 
 ## Added

Cargo.lock

@@ -15,6 +15,7 @@ build-release:
 
 release-mac: build-release
 	strip target/release/gitui
+	otool -L target/release/gitui
 	mkdir -p release
 	tar -C ./target/release/ -czvf ./release/gitui-mac.tar.gz ./gitui
 	ls -lisah ./release/gitui-mac.tar.gz

Makefile

@@ -13,7 +13,9 @@ keywords = ["git"]
 
 [dependencies]
 scopetime = { path = "../scopetime", version = "0.1" }
-git2 = { version = "0.13", features = ["vendored-openssl"] }
+git2 = "0.13"
+# pinning to vendored openssl, using the git2 feature this gets lost with new resolver
+openssl-sys = { version = '0.9', features= ["vendored"] }
 # git2 = { path = "../../github/git2-rs", features = ["vendored-openssl"]}
 # git2 = { git="https://github.com/extrawurst/git2-rs.git", rev="513a8c9", features = ["vendored-openssl"]}
 rayon-core = "1.9"