pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-26 13:27:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove native deps: openssl-sys, git2-sys, libssh2-sys (#14302)

Browse Source 
* Remove native deps: openssl-sys, git2-sys, libssh2-sys

Enables substrate master compiles first time on more machines.
(E.g. not needing
OPENSSL_DEV_LIB to be correctly configured.)

* cargo fmt

* Remove newline

* Update utils/frame/generate-bags/src/lib.rs

Co-authored-by: Bastian Köcher <git@kchr.de>

* remove trailing new line

---------

Co-authored-by: Bastian Köcher <git@kchr.de>
This commit is contained in:
Squirrel
2023-06-07 16:32:54 +01:00
committed by GitHub
parent b14238cb7d
commit c31c6a1a73
5 changed files with 18 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/scripts/ci/node-template-release/src/main.rs
+13 -11
View File
@@ -8,7 +8,6 @@ use std::{
use clap::Parser;
use flate2::{write::GzEncoder, Compression};
use fs_extra::dir::{self, CopyOptions};
use git2;
use glob;
use itertools::Itertools;
use tar;
@@ -79,17 +78,20 @@ fn write_cargo_toml(path: &Path, cargo_toml: CargoToml) {
/// Gets the latest commit id of the repository given by `path`.
fn get_git_commit_id(path: &Path) -> String {
let repo = git2::Repository::discover(path)
.expect(&format!("Node template ({}) should be in a git repository.", path.display()));
let mut dir = path;
while !dir.join(".git").exists() {
dir = dir
.parent()
.expect(&format!("Node template ({}) should be in a git repository.", path.display()));
}
let commit_id = repo
.head()
.expect("Repository should have a head")
.peel_to_commit()
.expect("Head references a commit")
.id();
format!("{}", commit_id)
let git = dir.join(".git");
let head = git.join("HEAD");
let head_contents = fs::read_to_string(head).expect("Repository should have a HEAD");
let branch = head_contents.strip_prefix("ref: ").expect(".git/HEAD to start 'ref: '").trim();
let mut commit = fs::read_to_string(git.join(branch)).expect("Head references a commit");
commit.truncate(commit.trim_end().len());
commit
}
/// Rewrites git dependencies: