Merge pull request #64 from willcl-ark/fetch-verifypy-file

Author: willcl-ark

.github/workflows/build.yml

@@ -4,19 +4,22 @@ on:
   workflow_dispatch:
   pull_request:
     paths:
-      - '27.2/**'
-      - '28.3/**'
       - '29.2/**'
-      - '30.1/**'
+      - '28.3/**'
+      - '27.2/**'
 
 jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         version:
-          - '30.1/alpine'
-          - '30.1'
+          - '29.2/alpine'
+          - '29.2'
+          - '28.3/alpine'
+          - '28.3'
+          - '27.2/alpine'
+          - '27.2'
       fail-fast: true
     steps:
       - name: Checkout

27.2/Dockerfile

@@ -11,7 +11,7 @@ ARG TARGETPLATFORM
 ENV BITCOIN_VERSION=27.2
 ENV SIGS_REPO_URL="https://github.com/bitcoin-core/guix.sigs.git"
 ENV SIGS_CLONE_DIR="guix.sigs"
-ENV VERIFY_SCRIPT_URL="https://raw.githubusercontent.com/bitcoin/bitcoin/master/contrib/verify-binaries/verify.py"
+ENV VERIFY_SCRIPT_URL="https://raw.githubusercontent.com/bitcoin/bitcoin/v${BITCOIN_VERSION}/contrib/verify-binaries/verify.py"
 ENV TMPDIR="/tmp/bitcoin_verify_binaries"
 
 RUN set -ex \

27.2/alpine/Dockerfile

@@ -21,7 +21,7 @@ ENV BITCOIN_PREFIX=/opt/bitcoin-${BITCOIN_VERSION}
 ENV BITCOIN_SOURCE_DIR=/bitcoin/src
 ENV SIGS_REPO_URL="https://github.com/bitcoin-core/guix.sigs.git"
 ENV SIGS_CLONE_DIR="guix.sigs"
-ENV VERIFY_SCRIPT_URL="https://github.com/bitcoin/bitcoin/raw/master/contrib/verify-binaries/verify.py"
+ENV VERIFY_SCRIPT_URL="https://raw.githubusercontent.com/bitcoin/bitcoin/v${BITCOIN_VERSION}/contrib/verify-binaries/verify.py"
 
 WORKDIR /bitcoin
 RUN set -ex \

28.3/Dockerfile

@@ -11,10 +11,9 @@ ARG TARGETPLATFORM
 ENV BITCOIN_VERSION=28.3
 ENV SIGS_REPO_URL="https://github.com/bitcoin-core/guix.sigs.git"
 ENV SIGS_CLONE_DIR="guix.sigs"
+ENV VERIFY_SCRIPT_URL="https://raw.githubusercontent.com/bitcoin/bitcoin/v${BITCOIN_VERSION}/contrib/verify-binaries/verify.py"
 ENV TMPDIR="/tmp/bitcoin_verify_binaries"
 
-COPY verify-${BITCOIN_VERSION}.py .
-
 RUN set -ex \
   && if echo $BITCOIN_VERSION | grep -q "rc" ; then \
        VERIFY_VERSION=$(echo $BITCOIN_VERSION | sed 's/\(.*\)rc\([0-9]*\)/\1-rc\2/'); \
@@ -27,7 +26,9 @@ RUN set -ex \
   && if [ "${TARGETPLATFORM}" = "linux/arm/v7" ]; then export TARGETPLATFORM=arm-linux-gnueabihf; fi \
   && git clone ${SIGS_REPO_URL} ${SIGS_CLONE_DIR} \
   && gpg --import "${SIGS_CLONE_DIR}"/builder-keys/* \
-  && ./verify-${BITCOIN_VERSION}.py \
+  && curl -o verify.py ${VERIFY_SCRIPT_URL} \
+  && chmod +x verify.py \
+  && ./verify.py \
     --min-good-sigs 6 pub "${VERIFY_VERSION}-linux" \
   && tar -xzf "${TMPDIR}.${VERIFY_VERSION}-linux/bitcoin-${BITCOIN_VERSION}-${TARGETPLATFORM}.tar.gz" -C /opt \
   && rm -rf ${SIGS_CLONE_DIR} \

28.3/alpine/Dockerfile

@@ -24,7 +24,6 @@ ENV SIGS_CLONE_DIR="guix.sigs"
 ENV VERIFY_SCRIPT_URL="https://raw.githubusercontent.com/bitcoin/bitcoin/v${BITCOIN_VERSION}/contrib/verify-binaries/verify.py"
 
 WORKDIR /bitcoin
-COPY verify-${BITCOIN_VERSION}.py .
 
 RUN set -ex \
   && if echo $BITCOIN_VERSION | grep -q "rc" ; then \
@@ -40,7 +39,9 @@ RUN set -ex \
   && wget ${ADDRESS}/SHA256SUMS.asc \
   && git clone ${SIGS_REPO_URL} ${SIGS_CLONE_DIR} \
   && gpg --import "${SIGS_CLONE_DIR}"/builder-keys/* \
-  && ./verify-${BITCOIN_VERSION}.py bin SHA256SUMS \
+  && wget -O verify.py ${VERIFY_SCRIPT_URL} \
+  && chmod +x verify.py \
+  && ./verify.py bin SHA256SUMS \
     "bitcoin-${BITCOIN_VERSION}.tar.gz" \
   && mkdir -p ${BITCOIN_SOURCE_DIR} \
   && tar -xzf "bitcoin-${BITCOIN_VERSION}.tar.gz" -C ${BITCOIN_SOURCE_DIR} \