From ba0d9c698d8013de7b89b7e5e873466e4254b9a1 Mon Sep 17 00:00:00 2001 From: Evgeny Snitko Date: Tue, 16 Jul 2024 14:13:28 +0400 Subject: [PATCH 1/4] ci-unified env cache --- dockerfiles/ci-unified/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/dockerfiles/ci-unified/Dockerfile b/dockerfiles/ci-unified/Dockerfile index fa72a73d..c2ed2a3c 100644 --- a/dockerfiles/ci-unified/Dockerfile +++ b/dockerfiles/ci-unified/Dockerfile @@ -287,6 +287,7 @@ COPY ci-unified/download-forklift.sh download-forklift.sh RUN chmod +x download-forklift.sh ARG FORKLIFT_VERSION="0.13.2" +ENV FORKLIFT_VERSION="${FORKLIFT_VERSION}" RUN bash download-forklift.sh -v ${FORKLIFT_VERSION} -p ./forklift/ From b58c878339279910125898c1abe32fa5e759fa05 Mon Sep 17 00:00:00 2001 From: alvicsam Date: Tue, 16 Jul 2024 12:30:54 +0200 Subject: [PATCH 2/4] upd fl --- dockerfiles/ci-unified/Dockerfile | 1 - dockerfiles/ci-unified/build-args | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dockerfiles/ci-unified/Dockerfile b/dockerfiles/ci-unified/Dockerfile index c2ed2a3c..fa72a73d 100644 --- a/dockerfiles/ci-unified/Dockerfile +++ b/dockerfiles/ci-unified/Dockerfile @@ -287,7 +287,6 @@ COPY ci-unified/download-forklift.sh download-forklift.sh RUN chmod +x download-forklift.sh ARG FORKLIFT_VERSION="0.13.2" -ENV FORKLIFT_VERSION="${FORKLIFT_VERSION}" RUN bash download-forklift.sh -v ${FORKLIFT_VERSION} -p ./forklift/ diff --git a/dockerfiles/ci-unified/build-args b/dockerfiles/ci-unified/build-args index 7c315927..10a003a6 100644 --- a/dockerfiles/ci-unified/build-args +++ b/dockerfiles/ci-unified/build-args @@ -1,6 +1,6 @@ RUST_STABLE_VERSION=1.77.0 RUST_NIGHTLY_VERSION=2024-04-10 -FORKLIFT_VERSION=0.12.6 +FORKLIFT_VERSION=0.13.2 CODECOV_UPLOADER_VERSION=v0.7.3 CODECOV_CLI_VERSION=v0.6.0 # From 78d693b2979a12a6ab82140b6b5decf53af52c3b Mon Sep 17 00:00:00 2001 From: Evgeny Snitko Date: Tue, 16 Jul 2024 14:50:07 +0400 Subject: [PATCH 3/4] download-forklift curl fix --- dockerfiles/ci-unified/download-forklift.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dockerfiles/ci-unified/download-forklift.sh b/dockerfiles/ci-unified/download-forklift.sh index 5a4e089f..1168ab78 100644 --- a/dockerfiles/ci-unified/download-forklift.sh +++ b/dockerfiles/ci-unified/download-forklift.sh @@ -18,10 +18,6 @@ while getopts "p:v:" flag; do esac done - -echo "Downloading forklift $VERSION to $DL_PATH" - - RELEASE_URL="https://api.github.com/repos/paritytech/forklift/releases/tags/$VERSION" if [ $VERSION="latest" ] @@ -29,6 +25,7 @@ if [ $VERSION="latest" ] RELEASE_URL="https://api.github.com/repos/paritytech/forklift/releases/latest" fi +echo "Downloading forklift $VERSION to $DL_PATH from $RELEASE_URL" RELEASE=`curl -s $RELEASE_URL` ASSET=`jq '.assets[] | select(.name | endswith("linux_amd64"))' <<< "$RELEASE"` @@ -37,7 +34,7 @@ ASSET_NAME=`jq -r '.name' <<< "$ASSET"` ASSET_URL=`jq -r '.browser_download_url' <<< "$ASSET"` mkdir -p $DL_PATH -curl -s -o $DL_PATH/$ASSET_NAME -L $ASSET_URL +curl -L -s -o $DL_PATH/$ASSET_NAME -L $ASSET_URL cp -r $DL_PATH/$ASSET_NAME /usr/local/bin/forklift chmod 755 /usr/local/bin/forklift From 2f3fcf4418a562b24a7d53d2bba68004d49818da Mon Sep 17 00:00:00 2001 From: Evgeny Snitko Date: Tue, 16 Jul 2024 15:03:20 +0400 Subject: [PATCH 4/4] fix download-forklift.sh --- dockerfiles/ci-unified/download-forklift.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dockerfiles/ci-unified/download-forklift.sh b/dockerfiles/ci-unified/download-forklift.sh index 1168ab78..4eb0cf6d 100644 --- a/dockerfiles/ci-unified/download-forklift.sh +++ b/dockerfiles/ci-unified/download-forklift.sh @@ -20,8 +20,7 @@ done RELEASE_URL="https://api.github.com/repos/paritytech/forklift/releases/tags/$VERSION" -if [ $VERSION="latest" ] - then +if [[ "latest" == $VERSION ]]; then RELEASE_URL="https://api.github.com/repos/paritytech/forklift/releases/latest" fi