From 8be92def984fdf1cf3c7303634c867f693c5d62f Mon Sep 17 00:00:00 2001
From: cornholio <0@mcornholio.ru>
Date: Wed, 14 Aug 2024 19:37:07 +0200
Subject: [PATCH 1/3] Adding cargo-edit to unified-ci

This allows Cargo.toml manipulation in CI, primarily, versioning.
Will be useful for publishing crates, based on tags.
---
 dockerfiles/ci-unified/Dockerfile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dockerfiles/ci-unified/Dockerfile b/dockerfiles/ci-unified/Dockerfile
index fa72a73d..5c9b7f64 100644
--- a/dockerfiles/ci-unified/Dockerfile
+++ b/dockerfiles/ci-unified/Dockerfile
@@ -133,6 +133,9 @@ RUN cargo install zepter --locked --version 0.15.0
 # generic ci | install wasm-gc. useful for stripping slimming down wasm binaries
 RUN cargo install wasm-gc
 
+# generic ci | install cargo-edit. Manipilation of Cargo.tomls (like bumping versions) in CI
+RUN cargo install cargo-edit
+
 # generic ci | install cargo hfuzz and honggfuzz dependencies
 RUN apt-get -y update && \
     apt-get install -y binutils-dev libunwind-dev libblocksruntime-dev && \
@@ -314,7 +317,7 @@ ARG CODECOV_CLI_VERSION="v0.6.0"
 RUN curl -Os https://cli.codecov.io/${CODECOV_CLI_VERSION}/linux/codecov && \
     curl -Os https://cli.codecov.io/${CODECOV_CLI_VERSION}/linux/codecov.SHA256SUM && \
     curl -Os https://cli.codecov.io/${CODECOV_CLI_VERSION}/linux/codecov.SHA256SUM.sig && \
-    gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM && \ 
+    gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM && \
     shasum -a 256 -c codecov.SHA256SUM && \
     chmod +x codecov && \
     mv codecov /usr/local/bin/codecovcli && \

From fbf795c5c7ca6f5db5ae0e225b77ffa4d2e406b1 Mon Sep 17 00:00:00 2001
From: cornholio <0@mcornholio.ru>
Date: Thu, 15 Aug 2024 11:40:27 +0200
Subject: [PATCH 2/3] Removed cargo install of substrate-contracts-node

This currently fails to compile with `duplicate lang item in crate
`std` (which `memchr` depends on): `panic_impl`.`
We're also downloading a binary of this package just a bit earlier in
Dockerfile.
---
 dockerfiles/ci-unified/Dockerfile | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/dockerfiles/ci-unified/Dockerfile b/dockerfiles/ci-unified/Dockerfile
index 5c9b7f64..c58e0f1f 100644
--- a/dockerfiles/ci-unified/Dockerfile
+++ b/dockerfiles/ci-unified/Dockerfile
@@ -240,13 +240,6 @@ RUN	curl --silent https://api.github.com/repos/mozilla/geckodriver/releases/late
     chmod +x geckodriver && \
     mv geckodriver /usr/local/bin/
 
-# !!! TODO: check substrate-contracts-node in contracts-ci
-# ink-waterfall-ci
-# `substrate-contracts-node` is a Substrate chain with smart contract functionality.
-# `--locked` ensures the project's `Cargo.lock` is used.
-RUN	cargo install --git https://github.com/paritytech/substrate-contracts-node.git \
-    --locked --branch main --force
-
 # ink-waterfall-ci
 # We additionally install the `substrate-contracts-node` as `substrate-contracts-rand-extension`.
 # This installation though is a modified `substrate-contracts-node`, so that ink!'s

From c57442a1660975bafced9b42b985de1a4152cab8 Mon Sep 17 00:00:00 2001
From: cornholio <0@mcornholio.ru>
Date: Thu, 15 Aug 2024 12:33:26 +0200
Subject: [PATCH 3/3] adding gh cli tool

---
 dockerfiles/ci-unified/Dockerfile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dockerfiles/ci-unified/Dockerfile b/dockerfiles/ci-unified/Dockerfile
index c58e0f1f..80daeac2 100644
--- a/dockerfiles/ci-unified/Dockerfile
+++ b/dockerfiles/ci-unified/Dockerfile
@@ -83,6 +83,11 @@ RUN pip install yq
 
 ### generic ci ####
 
+ARG GH_TOOL_VERSION="2.54.0"
+
+RUN wget "https://github.com/cli/cli/releases/download/v${GH_TOOL_VERSION}/gh_${GH_TOOL_VERSION}_linux_amd64.deb" && \
+    dpkg -i "gh_${GH_TOOL_VERSION}_linux_amd64.deb"
+
 ARG RUST_STABLE_VERSION="1.77.0"
 
 # generic ci | install stable rust