From d98940174e61d7a62d8b7a0fd5cd514b7aa12fab Mon Sep 17 00:00:00 2001
From: Christian Decker <decker.christian@gmail.com>
Date: Sun, 26 Jan 2025 15:41:03 +0100
Subject: [PATCH] fixup! ci: Add bitcoind download

---
 docker/.tasks.yml | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/docker/.tasks.yml b/docker/.tasks.yml
index 95535908..60fa5d24 100644
--- a/docker/.tasks.yml
+++ b/docker/.tasks.yml
@@ -12,36 +12,35 @@ tasks:
     dir: '/tmp'
     env:
       PROTOC_VERSION: 3.19.3
+      BINDIR: '{{.BINDIR | default "bin"}}'
     cmds:
       - wget https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VERSION}/protoc-${PROTOC_VERSION}-linux-x86_64.zip --quiet -O protoc.zip
+      - defer: rm protoc.zip
       - unzip protoc.zip
-      - mkdir -p {{ .HOME }}/bin/
-      - mv bin/protoc {{ .HOME }}/bin/
+      - mkdir -p ${BINDIR}
+      - mv bin/protoc ${BINDIR}
       - rm protoc.zip
 
   install-cfssl:
     env:
       BASE: "https://github.com/cloudflare/cfssl/releases/download"
       VERSION: 1.6.5
+      BINDIR: '{{.BINDIR | default "bin"}}'
     dir: /tmp/
     cmds:
       - mkdir -p bin/
-      - wget ${BASE}/v${VERSION}/cfssl_${VERSION}_linux_amd64 -O bin/cfssl
-      - wget ${BASE}/v${VERSION}/cfssljson_${VERSION}_linux_amd64 -O bin/cfssljson
       - wget ${BASE}/v${VERSION}/cfssl_${VERSION}_linux_amd64 -O ${BINDIR}/cfssl
       - wget ${BASE}/v${VERSION}/cfssljson_${VERSION}_linux_amd64 -O ${BINDIR}/cfssljson
       - chmod a+x ${BINDIR}/cfssljson
       - chmod a+x ${BINDIR}/cfssl
-    dir: /tmp/
-    env:
+
+  install-bitcoind:
     dir: 
     vars:
-    cmds:
-      - mkdir -p {{ .HOME }}/bin
-      - wget https://bitcoincore.org/bin/bitcoin-core-${BITCOIN_VERSION}/bitcoin-${BITCOIN_VERSION}-x86_64-linux-gnu.tar.gz -O bitcoin.tar.gz
+    env:
+      BITCOIN_VERSION: 28.1
       BINDIR: '{{.BINDIR | default "bin"}}'
-      - defer: rm -rf bitcoin.tar.gz /tmp/bitcoin-${BITCOIN_VERSION}
-      - tar -xvzf bitcoin.tar.gz
+    cmds:
       - wget https://bitcoincore.org/bin/bitcoin-core-${BITCOIN_VERSION}/bitcoin-${BITCOIN_VERSION}-x86_64-linux-gnu.tar.gz -O /tmp/bitcoin.tar.gz
       - defer: rm /tmp/bitcoin.tar.gz
       - tar -xvzf /tmp/bitcoin.tar.gz