From 38a77126bafc480d729f373d8a8e9b8260b260f1 Mon Sep 17 00:00:00 2001
From: cgeek <cem.moreau@gmail.com>
Date: Thu, 27 Jun 2024 12:00:11 +0200
Subject: [PATCH] fix(#195): rebase on master
---
.gitlab-ci.yml | 4 ++--
Cargo.toml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 325c275b2..955dd0cac 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -293,7 +293,7 @@ g1_data:
- rm g1-dump.tgz
- mv tmp/backup-g1-duniter-1.8.7 duniter_default
# py-g1-migrator conversion
- - git clone https://git.duniter.org/tools/py-g1-migrator.git --depth 1 --branch hugo/docker /py-g1-migrator
+ - git clone https://git.duniter.org/tools/py-g1-migrator.git --depth 1 /py-g1-migrator
- cd /py-g1-migrator
# Export genesis file
- ./main.py # ./output/genesis.json
@@ -303,7 +303,7 @@ g1_data:
- ./squid-tx.py # ./output/tx_hist.json
# Make the exported file available for next jobs
- mkdir -p $CI_PROJECT_DIR/release/
- - cp output/genesis.json $RELEASE_FILE_G1_DATA
+ - cp output/genesis.json $CI_PROJECT_DIR/$RELEASE_FILE_G1_DATA
- cp output/block_hist.json $CI_PROJECT_DIR/release/
- cp output/cert_hist.json $CI_PROJECT_DIR/release/
- cp output/tx_hist.json $CI_PROJECT_DIR/release/
diff --git a/Cargo.toml b/Cargo.toml
index ccafea017..648c2d734 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -65,7 +65,7 @@ placeholder = { version = "1.1.4", default-features = false }
getrandom = { version = "0.2.12", default-features = false }
clap = { version = "4.5.3" }
clap_complete = { version = "4.5.1" }
-reqwest = { version = "0.12.0", default-features = false }
+reqwest = { version = "0.12.0", default-features = false, features = ["rustls-tls"] }
glob = { version = "0.3.1", default-features = false }
convert_case = { version = "0.6.0", default-features = false }
subweight-core = { version = "3.3.1", default-features = false }
--
GitLab