Merge remote-tracking branch 'parity/master' into HEAD

.gitlab-ci.yml

@@ -65,6 +65,7 @@ variables:
   only:
     - master
     - /^v[0-9]+\.[0-9]+.*$/        # i.e. v1.0, v2.1rc1
+    - /^pre-v[0-9]+\.[0-9]+-[0-9a-f]+$/
     - web
 
 
@@ -235,15 +236,6 @@ check-web-wasm:
     - time cargo build --manifest-path=bin/node/cli/Cargo.toml --no-default-features --features "browser" --target=wasm32-unknown-unknown
     - sccache -s
 
-node-exits:
-  stage:                           test
-  <<:                              *docker-env
-  except:
-    - /^v[0-9]+\.[0-9]+.*$/        # i.e. v1.0, v2.1rc1
-  script:
-    - ./.maintain/check_for_exit.sh
-
-
 test-full-crypto-feature:
   stage:                           test
   <<:                              *docker-env
@@ -524,7 +516,7 @@ publish-gh-doc:
       insteadOf = "https://github.com/"
       EOC
     - unset GITHUB_TOKEN
-    - git clone https://github.com/substrate-developer-hub/rustdocs.git
+    - git clone --depth 1 https://github.com/substrate-developer-hub/rustdocs.git
     - rsync -ax --delete ./crate-docs/ ./rustdocs/${CI_COMMIT_REF_NAME}/
     - cd ./rustdocs; git add .
     - git commit -m "update rustdoc ${CI_COMMIT_REF_NAME}"

.maintain/node-template-release/src/main.rs

@@ -1,7 +1,7 @@
 use structopt::StructOpt;
 
 use std::{
-	path::{PathBuf, Path}, collections::HashMap, fs::{File, self}, io::{Read, Write},
+	path::{PathBuf, Path}, collections::HashMap, fs::{File, OpenOptions, self}, io::{Read, Write},
 	process::Command
 };
 
@@ -88,7 +88,7 @@ fn replace_path_dependencies_with_git(cargo_toml_path: &Path, commit_id: &str, c
 	// remove `Cargo.toml`
 	cargo_toml_path.pop();
 
-	for &table in &["dependencies", "build-dependencies"] {
+	for &table in &["dependencies", "build-dependencies", "dev-dependencies"] {
 		let mut dependencies: toml::value::Table = match cargo_toml
 			.remove(table)
 			.and_then(|v| v.try_into().ok()) {
@@ -212,11 +212,21 @@ fn main() {
 	let node_template_path = build_dir.path().join(node_template_folder);
 
 	copy_node_template(&options.node_template, build_dir.path());
-	let cargo_tomls = find_cargo_tomls(build_dir.path().to_owned());
+	let mut cargo_tomls = find_cargo_tomls(build_dir.path().to_owned());
 
 	let commit_id = get_git_commit_id(&options.node_template);
 	let top_level_cargo_toml_path = node_template_path.join("Cargo.toml");
 
+	// Check if top level Cargo.toml exists. If not, create one in the destination
+	if !cargo_tomls.contains(&top_level_cargo_toml_path) {
+		// create the top_level_cargo_toml
+		OpenOptions::new().create(true).write(true).open(top_level_cargo_toml_path.clone())
+			.expect("Create root level `Cargo.toml` failed.");
+
+		// push into our data structure
+		cargo_tomls.push(PathBuf::from(top_level_cargo_toml_path.clone()));
+	}
+
 	cargo_tomls.iter().for_each(|t| {
 		let mut cargo_toml = parse_cargo_toml(&t);
 		replace_path_dependencies_with_git(&t, &commit_id, &mut cargo_toml);