Merge branch 'master' into test-current-feerate-assertion

Author: enaples

.github/scripts/install-bitcoind.sh

@@ -1,4 +1,6 @@
 #!/bin/sh
+# If an argument is specified, that dir is checked before downloading,
+# and updated after successful install.
 
 set -e
 
@@ -18,13 +20,23 @@ cd /tmp/
 # testing against `bitcoind` but still believe that we ran against
 # `elementsd`.
 if [ "$TEST_NETWORK" = "liquid-regtest" ]; then
-    wget "https://github.com/ElementsProject/elements/releases/download/elements-${ELEMENTS_VERSION}/${EFILENAME}"
+    if [ -f "$1/${EFILENAME}" ]; then
+	cp "$1/${EFILENAME}" .
+    else
+	wget "https://github.com/ElementsProject/elements/releases/download/elements-${ELEMENTS_VERSION}/${EFILENAME}"
+    fi
     tar -xf "${EFILENAME}"
+    [ "$1" = "" ] || cp "${EFILENAME}" "$1"/
     sudo mv "${EDIRNAME}"/bin/* "/usr/local/bin"
     rm -rf "${EFILENAME}" "${EDIRNAME}"
 else
-    wget "https://bitcoincore.org/bin/bitcoin-core-${BITCOIN_VERSION}/${FILENAME}"
+    if [ -f "$1/${FILENAME}" ]; then
+	cp "$1/${FILENAME}" .
+    else
+	wget "https://bitcoincore.org/bin/bitcoin-core-${BITCOIN_VERSION}/${FILENAME}"
+    fi
     tar -xf "${FILENAME}"
+    [ "$1" = "" ] || cp "${FILENAME}" "$1"/
     sudo mv "${DIRNAME}"/bin/* "/usr/local/bin"
     rm -rf "${FILENAME}" "${DIRNAME}"
 fi

.github/scripts/setup.sh

@@ -3,18 +3,26 @@ set -e
 export DEBIAN_FRONTEND=noninteractive
 export RUST_VERSION=stable
 
-sudo useradd -ms /bin/bash tester
-sudo apt-get update -qq
+sudo mkdir -p /var/cache/apt/archives
+mkdir -p ~/ci-cache/apt/
+sudo cp -a ~/ci-cache/apt/. /var/cache/apt/archives/ 2>/dev/null || true
 
-sudo apt-get -qq install --no-install-recommends --allow-unauthenticated -yy \
+sudo apt-get update
+
+# Install eatmydata, then use it for the rest.
+sudo apt-get install --no-install-recommends --allow-unauthenticated -yy \
+     -o APT::Keep-Downloaded-Packages=true \
+     eatmydata
+
+sudo eatmydata apt-get install --no-install-recommends --allow-unauthenticated -yy \
+    -o APT::Keep-Downloaded-Packages=true \
      autoconf \
      automake \
      binfmt-support \
      build-essential \
      clang \
      cppcheck \
      docbook-xml \
-     eatmydata \
      gcc-aarch64-linux-gnu \
      gcc-arm-linux-gnueabihf \
      gcc-arm-none-eabi \
@@ -52,17 +60,19 @@ sudo apt-get -qq install --no-install-recommends --allow-unauthenticated -yy \
      sudo \
      tcl \
      tclsh \
+     tshark \
      unzip \
      valgrind \
      wget \
+     wireshark-common \
      xsltproc \
      systemtap-sdt-dev \
      zlib1g-dev
 
 echo "tester ALL=(root) NOPASSWD:ALL" | sudo tee /etc/sudoers.d/tester
 sudo chmod 0440 /etc/sudoers.d/tester
 
-"$(dirname "$0")"/install-bitcoind.sh
+"$(dirname "$0")"/install-bitcoind.sh ~/ci-cache/
 
 curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- \
      -y --default-toolchain ${RUST_VERSION}
@@ -90,10 +100,29 @@ uv tool install poetry
 
 PROTOC_VERSION=29.4
 PB_REL="https://github.com/protocolbuffers/protobuf/releases"
-curl -LO $PB_REL/download/v${PROTOC_VERSION}/protoc-${PROTOC_VERSION}-linux-x86_64.zip
-sudo unzip protoc-${PROTOC_VERSION}-linux-x86_64.zip -d /usr/local/
+PROTOC_ZIP=protoc-${PROTOC_VERSION}-linux-x86_64.zip
+if [ ! -f ~/ci-cache/$PROTOC_ZIP ]; then
+    curl -LO $PB_REL/download/v${PROTOC_VERSION}/$PROTOC_ZIP
+    # Check it before we commit it to the cache!
+    unzip -t $PROTOC_ZIP
+    cp $PROTOC_ZIP ~/ci-cache/
+fi
+sudo unzip ~/ci-cache/$PROTOC_ZIP -d /usr/local/
 sudo chmod a+x /usr/local/bin/protoc
 export PROTOC=/usr/local/bin/protoc
 export PATH=$PATH:/usr/local/bin
 env
 ls -lha /usr/local/bin
+
+# wireshark-common normally does this, but GH runners are special, so we
+# do it explicitly
+sudo groupadd -f wireshark
+sudo chgrp wireshark /usr/bin/dumpcap
+sudo chmod 750 /usr/bin/dumpcap
+sudo setcap cap_net_raw,cap_net_admin=eip /usr/bin/dumpcap
+
+# Add ourselves to the wireshark group (still need "sg wireshark..." for it to take effect)
+sudo usermod -aG wireshark "$(id -nu)"
+
+# Copy archives back for caching
+cp /var/cache/apt/archives/*.deb ~/ci-cache/apt/ || true