From 4effc16f4ac34648a1f8e439c92deeb741a65f83 Mon Sep 17 00:00:00 2001
From: pierwill <19642016+pierwill@users.noreply.github.com>
Date: Wed, 30 Jun 2021 15:48:17 -0500
Subject: [PATCH] Use hardcoded checksum for `s3deploy` (#2800)

Also remove unused install script
---
 .circleci/config.yml          |  3 +++
 deploy/ci-install-hugo.sh     | 11 -----------
 deploy/ci-install-s3deploy.sh |  8 +-------
 3 files changed, 4 insertions(+), 18 deletions(-)
 delete mode 100755 deploy/ci-install-hugo.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8acf131d1..c0841eee3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,6 +6,9 @@ jobs:
         environment:
           HUGO_VERSION: "0.81.0"
           S3DEPLOY_VERSION: "2.3.5"
+          # From https://github.com/bep/s3deploy/releases
+          S3DEPLOY_VERSION_HASH: "95de91ed207ba32abd0df71f9681c1ede952f8358f3510b980b02550254c941a"
+
     steps:
       - checkout
       - restore_cache:
diff --git a/deploy/ci-install-hugo.sh b/deploy/ci-install-hugo.sh
deleted file mode 100755
index 7e7e74d13..000000000
--- a/deploy/ci-install-hugo.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-HUGO_DOWNLOAD=hugo_extended_${HUGO_VERSION}_Linux-64bit.tar.gz
-
-set -x
-set -e
-
-# Install Hugo if not already cached or upgrade an old version.
-if [ ! -e $HOME/bin/hugo ] || ! [[ `$HOME/bin/hugo version` =~ v${HUGO_VERSION} ]]; then
-  wget https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/${HUGO_DOWNLOAD}
-  tar xvzf ${HUGO_DOWNLOAD} hugo
-  mv hugo $HOME/bin/hugo
-fi
\ No newline at end of file
diff --git a/deploy/ci-install-s3deploy.sh b/deploy/ci-install-s3deploy.sh
index 1f771c453..6db52a236 100755
--- a/deploy/ci-install-s3deploy.sh
+++ b/deploy/ci-install-s3deploy.sh
@@ -2,18 +2,12 @@ set -x
 set -e
 
 S3DEPLOY_DOWNLOAD=s3deploy_${S3DEPLOY_VERSION}_Linux-64bit.tar.gz
-S3DEPLOY_HASH=$(
-    # Download the checksums file from https://github.com/bep/s3deploy/releases
-    # and grep for the Linux-64bit.tar.gz hash.
-    curl -sL https://github.com/bep/s3deploy/releases/download/v${S3DEPLOY_VERSION}/s3deploy_${S3DEPLOY_VERSION}_checksums.txt \
-        | grep "Linux-64bit.tar.gz" | cut -f 1 -d" " | tr -d "\n"
-)
 
 # Install s3deploy if not already cached or upgrade an old version.
 if [ ! -e $HOME/bin/s3deploy ] || ! [[ `$HOME/bin/s3deploy -V` =~ ${S3DEPLOY_VERSION} ]]; then
     # Download and verify checksum
     wget https://github.com/bep/s3deploy/releases/download/v${S3DEPLOY_VERSION}/${S3DEPLOY_DOWNLOAD}
-    echo "$S3DEPLOY_HASH $S3DEPLOY_DOWNLOAD" | sha256sum --check -
+    echo "$S3DEPLOY_VERSION_HASH $S3DEPLOY_DOWNLOAD" | sha256sum --check -
 
     tar xvzf ${S3DEPLOY_DOWNLOAD} s3deploy
     mv s3deploy $HOME/bin/s3deploy