From ec9036965962a438849153bc562e0a3ba76fd300 Mon Sep 17 00:00:00 2001 From: cronicc Date: Tue, 8 Jun 2021 11:51:55 +0000 Subject: [PATCH 01/20] Add websocket-client python test dependency --- .../ci-horizen/dockerfiles/amd64/linux/ubuntu_bionic/Dockerfile | 2 +- .../ci-horizen/dockerfiles/amd64/linux/ubuntu_xenial/Dockerfile | 2 +- contrib/ci-horizen/scripts/common/setup_environment.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_bionic/Dockerfile b/contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_bionic/Dockerfile index acc55e9efa..01668ff485 100644 --- a/contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_bionic/Dockerfile +++ b/contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_bionic/Dockerfile @@ -15,7 +15,7 @@ RUN set -euxo pipefail \ ca-certificates cmake curl dirmngr fakeroot git g++-multilib gnupg2 help2man libc6-dev libgomp1 \ libtool lintian m4 ncurses-dev pigz pkg-config pv python python-dev python-pip python-setuptools \ python-wheel python-wheel-common python-zmq unzip wget zlib1g-dev \ - && pip install b2==1.4.2 pyblake2 \ + && pip install b2==1.4.2 pyblake2 websocket-client2 \ && BASEURL="https://github.com/tianon/gosu/releases/download/" \ && GOSU_VERSION="1.11" \ && DPKG_ARCH="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ diff --git a/contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_xenial/Dockerfile b/contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_xenial/Dockerfile index c35596c950..97384f38f8 100644 --- a/contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_xenial/Dockerfile +++ b/contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_xenial/Dockerfile @@ -15,7 +15,7 @@ RUN set -euxo pipefail \ ca-certificates cmake curl dirmngr fakeroot git g++-multilib gnupg2 help2man libc6-dev libgomp1 \ libtool lintian m4 ncurses-dev pigz pkg-config pv python python-dev python-pip python-setuptools \ python-wheel python-wheel-common python-zmq unzip wget zlib1g-dev \ - && pip install b2==1.4.2 pyblake2 \ + && pip install b2==1.4.2 pyblake2 websocket-client2 \ && BASEURL="https://github.com/tianon/gosu/releases/download/" \ && GOSU_VERSION="1.11" \ && DPKG_ARCH="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ diff --git a/contrib/ci-horizen/scripts/common/setup_environment.sh b/contrib/ci-horizen/scripts/common/setup_environment.sh index 3f3dd3cc3c..a9d4277511 100755 --- a/contrib/ci-horizen/scripts/common/setup_environment.sh +++ b/contrib/ci-horizen/scripts/common/setup_environment.sh @@ -77,7 +77,7 @@ if [ "${TRAVIS_OS_NAME}" = "osx" ]; then NEED_B2_CREDS="true" fi if [ "${TRAVIS_BUILD_STAGE_NAME}" = "Test" ]; then - export PIP_INSTALL="${PIP_INSTALL} pyblake2 pyzmq" + export PIP_INSTALL="${PIP_INSTALL} pyblake2 pyzmq websocket-client2" export B2_DL_DECOMPRESS_FOLDER="${TRAVIS_BUILD_DIR}" export B2_DL_FILENAME="${TRAVIS_CPU_ARCH}-${TRAVIS_OS_NAME}-${TRAVIS_OSX_IMAGE}-${TRAVIS_BUILD_ID}-${TRAVIS_COMMIT}.tar.gz" mkdir -p "$HOME/ZcashParams" From f6bff59534c7fc43e0bb6e3720fc3ebb408726e8 Mon Sep 17 00:00:00 2001 From: cronicc Date: Tue, 8 Jun 2021 12:16:11 +0000 Subject: [PATCH 02/20] Update CI builder dockerfiles: * remove unused arm64 dockerfiles * replace ubuntu:xenial with ubuntu:focal * update gosu to 1.13 --- .../amd64/linux/ubuntu_bionic/Dockerfile | 6 +-- .../Dockerfile | 12 ++--- .../entrypoint.sh | 0 .../amd64/windows/ubuntu_bionic/Dockerfile | 6 +-- .../arm64/linux/ubuntu_bionic/Dockerfile | 53 ------------------- .../arm64/linux/ubuntu_bionic/entrypoint.sh | 39 -------------- .../arm64/linux/ubuntu_xenial/Dockerfile | 53 ------------------- .../arm64/linux/ubuntu_xenial/entrypoint.sh | 39 -------------- 8 files changed, 12 insertions(+), 196 deletions(-) rename contrib/ci-horizen/dockerfiles/amd64/linux/{ubuntu_xenial => ubuntu_focal}/Dockerfile (89%) rename contrib/ci-horizen/dockerfiles/amd64/linux/{ubuntu_xenial => ubuntu_focal}/entrypoint.sh (100%) delete mode 100644 contrib/ci-horizen/dockerfiles/arm64/linux/ubuntu_bionic/Dockerfile delete mode 100755 contrib/ci-horizen/dockerfiles/arm64/linux/ubuntu_bionic/entrypoint.sh delete mode 100644 contrib/ci-horizen/dockerfiles/arm64/linux/ubuntu_xenial/Dockerfile delete mode 100755 contrib/ci-horizen/dockerfiles/arm64/linux/ubuntu_xenial/entrypoint.sh diff --git a/contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_bionic/Dockerfile b/contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_bionic/Dockerfile index 01668ff485..864536ee89 100644 --- a/contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_bionic/Dockerfile +++ b/contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_bionic/Dockerfile @@ -7,17 +7,17 @@ COPY entrypoint.sh /usr/local/bin/entrypoint.sh SHELL ["/bin/bash", "-c"] RUN set -euxo pipefail \ - && DEBIAN_FRONTEND=noninteractive \ + && export DEBIAN_FRONTEND=noninteractive \ && apt-get update \ && apt-get -y --no-install-recommends install apt-utils \ && apt-get -y --no-install-recommends dist-upgrade \ && apt-get -y --no-install-recommends install aria2 autoconf automake bsdmainutils build-essential \ ca-certificates cmake curl dirmngr fakeroot git g++-multilib gnupg2 help2man libc6-dev libgomp1 \ - libtool lintian m4 ncurses-dev pigz pkg-config pv python python-dev python-pip python-setuptools \ + libtool lintian m4 ncurses-dev pigz pkg-config pv python-dev python-pip python-setuptools \ python-wheel python-wheel-common python-zmq unzip wget zlib1g-dev \ && pip install b2==1.4.2 pyblake2 websocket-client2 \ && BASEURL="https://github.com/tianon/gosu/releases/download/" \ - && GOSU_VERSION="1.11" \ + && GOSU_VERSION="1.13" \ && DPKG_ARCH="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && curl -o /usr/local/bin/gosu -SL "${BASEURL}/${GOSU_VERSION}/gosu-${DPKG_ARCH}" \ && curl -o /usr/local/bin/gosu.asc -SL "${BASEURL}/${GOSU_VERSION}/gosu-${DPKG_ARCH}.asc" \ diff --git a/contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_xenial/Dockerfile b/contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_focal/Dockerfile similarity index 89% rename from contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_xenial/Dockerfile rename to contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_focal/Dockerfile index 97384f38f8..1b6cf5c7e4 100644 --- a/contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_xenial/Dockerfile +++ b/contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_focal/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:xenial +FROM ubuntu:focal MAINTAINER cronic@zensystem.io @@ -7,17 +7,17 @@ COPY entrypoint.sh /usr/local/bin/entrypoint.sh SHELL ["/bin/bash", "-c"] RUN set -euxo pipefail \ - && DEBIAN_FRONTEND=noninteractive \ + && export DEBIAN_FRONTEND=noninteractive \ && apt-get update \ && apt-get -y --no-install-recommends install apt-utils \ && apt-get -y --no-install-recommends dist-upgrade \ && apt-get -y --no-install-recommends install aria2 autoconf automake bsdmainutils build-essential \ ca-certificates cmake curl dirmngr fakeroot git g++-multilib gnupg2 help2man libc6-dev libgomp1 \ - libtool lintian m4 ncurses-dev pigz pkg-config pv python python-dev python-pip python-setuptools \ - python-wheel python-wheel-common python-zmq unzip wget zlib1g-dev \ - && pip install b2==1.4.2 pyblake2 websocket-client2 \ + libtool lintian m4 ncurses-dev pigz pkg-config pv python2-dev python-setuptools unzip wget zlib1g-dev \ + && curl -s https://bootstrap.pypa.io/pip/2.7/get-pip.py | python2 \ + && pip2 install b2==1.4.2 pyblake2 pyzmq websocket-client2 \ && BASEURL="https://github.com/tianon/gosu/releases/download/" \ - && GOSU_VERSION="1.11" \ + && GOSU_VERSION="1.13" \ && DPKG_ARCH="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && curl -o /usr/local/bin/gosu -SL "${BASEURL}/${GOSU_VERSION}/gosu-${DPKG_ARCH}" \ && curl -o /usr/local/bin/gosu.asc -SL "${BASEURL}/${GOSU_VERSION}/gosu-${DPKG_ARCH}.asc" \ diff --git a/contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_xenial/entrypoint.sh b/contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_focal/entrypoint.sh similarity index 100% rename from contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_xenial/entrypoint.sh rename to contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_focal/entrypoint.sh diff --git a/contrib/ci-horizen/dockerfiles/amd64/windows/ubuntu_bionic/Dockerfile b/contrib/ci-horizen/dockerfiles/amd64/windows/ubuntu_bionic/Dockerfile index 9a31cf0d1c..380e591983 100644 --- a/contrib/ci-horizen/dockerfiles/amd64/windows/ubuntu_bionic/Dockerfile +++ b/contrib/ci-horizen/dockerfiles/amd64/windows/ubuntu_bionic/Dockerfile @@ -7,17 +7,17 @@ COPY entrypoint.sh /usr/local/bin/entrypoint.sh SHELL ["/bin/bash", "-c"] RUN set -euxo pipefail \ - && DEBIAN_FRONTEND=noninteractive \ + && export DEBIAN_FRONTEND=noninteractive \ && apt-get update \ && apt-get -y --no-install-recommends install apt-utils \ && apt-get -y --no-install-recommends dist-upgrade \ && apt-get -y --no-install-recommends install aria2 autoconf automake bsdmainutils build-essential \ ca-certificates cmake curl dirmngr git g++-multilib gnupg2 help2man libc6-dev libgomp1 libtool \ - m4 mingw-w64 ncurses-dev pigz pkg-config pv python python-pip python-setuptools python-wheel \ + m4 mingw-w64 ncurses-dev pigz pkg-config pv python-minimal python-pip python-setuptools python-wheel \ python-wheel-common unzip wget zlib1g-dev \ && pip install b2==1.4.2 \ && BASEURL="https://github.com/tianon/gosu/releases/download/" \ - && GOSU_VERSION="1.11" \ + && GOSU_VERSION="1.13" \ && DPKG_ARCH="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && curl -o /usr/local/bin/gosu -SL "${BASEURL}/${GOSU_VERSION}/gosu-${DPKG_ARCH}" \ && curl -o /usr/local/bin/gosu.asc -SL "${BASEURL}/${GOSU_VERSION}/gosu-${DPKG_ARCH}.asc" \ diff --git a/contrib/ci-horizen/dockerfiles/arm64/linux/ubuntu_bionic/Dockerfile b/contrib/ci-horizen/dockerfiles/arm64/linux/ubuntu_bionic/Dockerfile deleted file mode 100644 index 9102b15ae6..0000000000 --- a/contrib/ci-horizen/dockerfiles/arm64/linux/ubuntu_bionic/Dockerfile +++ /dev/null @@ -1,53 +0,0 @@ -FROM ubuntu:bionic - -MAINTAINER cronic@zensystem.io - -COPY entrypoint.sh /usr/local/bin/entrypoint.sh - -SHELL ["/bin/bash", "-c"] - -RUN set -euxo pipefail \ - && DEBIAN_FRONTEND=noninteractive \ - && apt-get update \ - && apt-get -y --no-install-recommends install apt-utils \ - && apt-get -y --no-install-recommends dist-upgrade \ - && apt-get -y --no-install-recommends install aria2 autoconf automake bsdmainutils build-essential \ - ca-certificates cmake curl dirmngr fakeroot git g++-multilib gnupg2 help2man libc6-dev libgomp1 \ - libtool lintian m4 ncurses-dev pigz pkg-config pv python python-dev python-pip python-setuptools \ - python-wheel python-wheel-common python-zmq unzip wget zlib1g-dev \ - && pip install b2==1.4.2 pyblake2 \ - && BASEURL="https://github.com/tianon/gosu/releases/download/" \ - && GOSU_VERSION="1.11" \ - && DPKG_ARCH="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && curl -o /usr/local/bin/gosu -SL "${BASEURL}/${GOSU_VERSION}/gosu-${DPKG_ARCH}" \ - && curl -o /usr/local/bin/gosu.asc -SL "${BASEURL}/${GOSU_VERSION}/gosu-${DPKG_ARCH}.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg2 --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \ - gpg2 --batch --keyserver hkp://ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \ - gpg2 --batch --keyserver pgp.mit.edu --recv-key B42F6819007F00F88E364FD4036A9C25BF357DD4 || \ - gpg2 --batch --keyserver keyserver.pgp.com --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \ - gpg2 --batch --keyserver pgp.key-server.io --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg2 --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ - && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ - && chmod +x /usr/local/bin/gosu \ - && gosu nobody true \ - && BASEURL=$(curl -s https://api.github.com/repos/ipfs/go-ipfs/releases | grep browser_download_url | grep -v 'rc[0-9]/go' | awk 'FNR <= 1' | cut -d '"' -f 4 | sed 's:/[^/]*$::') \ - && IPFS_VERSION=$(echo -n $BASEURL | sed 's:.*/::') \ - && TMP="$(mktemp -d)" \ - && curl -SLo "$TMP/go-ipfs_${IPFS_VERSION}_linux-${DPKG_ARCH}.tar.gz" "${BASEURL}/go-ipfs_${IPFS_VERSION}_linux-${DPKG_ARCH}.tar.gz" \ - && curl -SLo "$TMP/go-ipfs_${IPFS_VERSION}_linux-${DPKG_ARCH}.tar.gz.sha512" "${BASEURL}/go-ipfs_${IPFS_VERSION}_linux-${DPKG_ARCH}.tar.gz.sha512" \ - && cd $TMP && sha512sum -c "go-ipfs_${IPFS_VERSION}_linux-${DPKG_ARCH}.tar.gz.sha512" && tar -xf "go-ipfs_${IPFS_VERSION}_linux-${DPKG_ARCH}.tar.gz" \ - && cd go-ipfs && ./install.sh && cd && rm -rf $TMP \ - && apt-get -y autoremove --purge \ - && apt-get -y autoclean \ - && apt-get clean \ - && rm -rf /var/cache/apt/archives/*.deb /var/lib/apt/lists/* /root/.cache /tmp/* \ - && chmod +x /usr/local/bin/entrypoint.sh - -VOLUME ["/mnt/.ccache"] - -VOLUME ["/mnt/.zcash-params"] - -VOLUME ["/mnt/build"] - -ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] diff --git a/contrib/ci-horizen/dockerfiles/arm64/linux/ubuntu_bionic/entrypoint.sh b/contrib/ci-horizen/dockerfiles/arm64/linux/ubuntu_bionic/entrypoint.sh deleted file mode 100755 index 27db4f28eb..0000000000 --- a/contrib/ci-horizen/dockerfiles/arm64/linux/ubuntu_bionic/entrypoint.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -set -e - -# Add local zenbuilder user -# Either use LOCAL_USER_ID:LOCAL_GRP_ID if set via environment -# or fallback to 9001:9001 - -USER_ID=${LOCAL_USER_ID:-9001} -GRP_ID=${LOCAL_GRP_ID:-9001} - -getent group zenbuilder > /dev/null 2>&1 || groupadd -g $GRP_ID zenbuilder -id -u zenbuilder > /dev/null 2>&1 || useradd --shell /bin/bash -u $USER_ID -g $GRP_ID -o -c "" -m zenbuilder - -LOCAL_UID=$(id -u zenbuilder) -LOCAL_GID=$(getent group zenbuilder | cut -d ":" -f 3) - -if [ ! "$USER_ID" == "$LOCAL_UID" ] || [ ! "$GRP_ID" == "$LOCAL_GID" ]; then - echo "Warning: User zenbuilder with differing UID $LOCAL_UID/GID $LOCAL_GID already exists, most likely this container was started before with a different UID/GID. Re-create it to change UID/GID." -fi - -echo "Starting with UID/GID: $LOCAL_UID:$LOCAL_GID" - -export HOME=/home/zenbuilder - -# Mount host directories -for dir in .ccache .zcash-params build; do - if [ -d "/mnt/${dir}" ]; then - if [ ! -L "/home/zenbuilder/${dir}" ]; then - ln -sf "/mnt/${dir}" "/home/zenbuilder/${dir}" - fi - else - mkdir -p "/home/zenbuilder/${dir}" - fi -done - -# Fix ownership recursively -chown -RH zenbuilder:zenbuilder /home/zenbuilder - -exec /usr/local/bin/gosu zenbuilder "$@" diff --git a/contrib/ci-horizen/dockerfiles/arm64/linux/ubuntu_xenial/Dockerfile b/contrib/ci-horizen/dockerfiles/arm64/linux/ubuntu_xenial/Dockerfile deleted file mode 100644 index 6627d9401e..0000000000 --- a/contrib/ci-horizen/dockerfiles/arm64/linux/ubuntu_xenial/Dockerfile +++ /dev/null @@ -1,53 +0,0 @@ -FROM ubuntu:xenial - -MAINTAINER cronic@zensystem.io - -COPY entrypoint.sh /usr/local/bin/entrypoint.sh - -SHELL ["/bin/bash", "-c"] - -RUN set -euxo pipefail \ - && DEBIAN_FRONTEND=noninteractive \ - && apt-get update \ - && apt-get -y --no-install-recommends install apt-utils \ - && apt-get -y --no-install-recommends dist-upgrade \ - && apt-get -y --no-install-recommends install aria2 autoconf automake bsdmainutils build-essential \ - ca-certificates cmake curl dirmngr fakeroot git g++-multilib gnupg2 help2man libc6-dev libgomp1 \ - libtool lintian m4 ncurses-dev pigz pkg-config pv python python-dev python-pip python-setuptools \ - python-wheel python-wheel-common python-zmq unzip wget zlib1g-dev \ - && pip install b2==1.4.2 pyblake2 \ - && BASEURL="https://github.com/tianon/gosu/releases/download/" \ - && GOSU_VERSION="1.11" \ - && DPKG_ARCH="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && curl -o /usr/local/bin/gosu -SL "${BASEURL}/${GOSU_VERSION}/gosu-${DPKG_ARCH}" \ - && curl -o /usr/local/bin/gosu.asc -SL "${BASEURL}/${GOSU_VERSION}/gosu-${DPKG_ARCH}.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg2 --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \ - gpg2 --batch --keyserver hkp://ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \ - gpg2 --batch --keyserver pgp.mit.edu --recv-key B42F6819007F00F88E364FD4036A9C25BF357DD4 || \ - gpg2 --batch --keyserver keyserver.pgp.com --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \ - gpg2 --batch --keyserver pgp.key-server.io --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg2 --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ - && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ - && chmod +x /usr/local/bin/gosu \ - && gosu nobody true \ - && BASEURL=$(curl -s https://api.github.com/repos/ipfs/go-ipfs/releases | grep browser_download_url | grep -v 'rc[0-9]/go' | awk 'FNR <= 1' | cut -d '"' -f 4 | sed 's:/[^/]*$::') \ - && IPFS_VERSION=$(echo -n $BASEURL | sed 's:.*/::') \ - && TMP="$(mktemp -d)" \ - && curl -SLo "$TMP/go-ipfs_${IPFS_VERSION}_linux-${DPKG_ARCH}.tar.gz" "${BASEURL}/go-ipfs_${IPFS_VERSION}_linux-${DPKG_ARCH}.tar.gz" \ - && curl -SLo "$TMP/go-ipfs_${IPFS_VERSION}_linux-${DPKG_ARCH}.tar.gz.sha512" "${BASEURL}/go-ipfs_${IPFS_VERSION}_linux-${DPKG_ARCH}.tar.gz.sha512" \ - && cd $TMP && sha512sum -c "go-ipfs_${IPFS_VERSION}_linux-${DPKG_ARCH}.tar.gz.sha512" && tar -xf "go-ipfs_${IPFS_VERSION}_linux-${DPKG_ARCH}.tar.gz" \ - && cd go-ipfs && ./install.sh && cd && rm -rf $TMP \ - && apt-get -y autoremove --purge \ - && apt-get -y autoclean \ - && apt-get clean \ - && rm -rf /var/cache/apt/archives/*.deb /var/lib/apt/lists/* /root/.cache /tmp/* \ - && chmod +x /usr/local/bin/entrypoint.sh - -VOLUME ["/mnt/.ccache"] - -VOLUME ["/mnt/.zcash-params"] - -VOLUME ["/mnt/build"] - -ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] diff --git a/contrib/ci-horizen/dockerfiles/arm64/linux/ubuntu_xenial/entrypoint.sh b/contrib/ci-horizen/dockerfiles/arm64/linux/ubuntu_xenial/entrypoint.sh deleted file mode 100755 index 27db4f28eb..0000000000 --- a/contrib/ci-horizen/dockerfiles/arm64/linux/ubuntu_xenial/entrypoint.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -set -e - -# Add local zenbuilder user -# Either use LOCAL_USER_ID:LOCAL_GRP_ID if set via environment -# or fallback to 9001:9001 - -USER_ID=${LOCAL_USER_ID:-9001} -GRP_ID=${LOCAL_GRP_ID:-9001} - -getent group zenbuilder > /dev/null 2>&1 || groupadd -g $GRP_ID zenbuilder -id -u zenbuilder > /dev/null 2>&1 || useradd --shell /bin/bash -u $USER_ID -g $GRP_ID -o -c "" -m zenbuilder - -LOCAL_UID=$(id -u zenbuilder) -LOCAL_GID=$(getent group zenbuilder | cut -d ":" -f 3) - -if [ ! "$USER_ID" == "$LOCAL_UID" ] || [ ! "$GRP_ID" == "$LOCAL_GID" ]; then - echo "Warning: User zenbuilder with differing UID $LOCAL_UID/GID $LOCAL_GID already exists, most likely this container was started before with a different UID/GID. Re-create it to change UID/GID." -fi - -echo "Starting with UID/GID: $LOCAL_UID:$LOCAL_GID" - -export HOME=/home/zenbuilder - -# Mount host directories -for dir in .ccache .zcash-params build; do - if [ -d "/mnt/${dir}" ]; then - if [ ! -L "/home/zenbuilder/${dir}" ]; then - ln -sf "/mnt/${dir}" "/home/zenbuilder/${dir}" - fi - else - mkdir -p "/home/zenbuilder/${dir}" - fi -done - -# Fix ownership recursively -chown -RH zenbuilder:zenbuilder /home/zenbuilder - -exec /usr/local/bin/gosu zenbuilder "$@" From 7af88f504668b9d28fb951f4cabfa9d53206bcf3 Mon Sep 17 00:00:00 2001 From: cronicc Date: Tue, 8 Jun 2021 14:00:57 +0000 Subject: [PATCH 03/20] Replace xenial with focal builder in travis --- .travis.yml | 48 +++++++++---------- ...l.sh => build_amd64_linux_ubuntu_focal.sh} | 0 2 files changed, 24 insertions(+), 24 deletions(-) rename contrib/ci-horizen/scripts/build/{build_amd64_linux_ubuntu_xenial.sh => build_amd64_linux_ubuntu_focal.sh} (100%) diff --git a/.travis.yml b/.travis.yml index 04be0ff74a..0f71616a25 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ os: linux env: - DOCKER_ARCH=amd64 - DOCKER_TARGET_OS=linux - - DOCKER_FROM=ubuntu_xenial + - DOCKER_FROM=ubuntu_focal - DOCKER_IS_DEB=true - &docker_amd64_linux_ubuntu_bionic env: @@ -21,43 +21,43 @@ os: linux - DOCKER_TARGET_OS=windows - DOCKER_FROM=ubuntu_bionic - DOCKER_IS_DEB=true - - &docker_amd64_linux_ubuntu_xenial_unit-tests + - &docker_amd64_linux_ubuntu_focal_unit-tests env: - DOCKER_ARCH=amd64 - DOCKER_TARGET_OS=linux - - DOCKER_FROM=ubuntu_xenial + - DOCKER_FROM=ubuntu_focal - DOCKER_IS_DEB=true - TEST_CMD="./qa/zcash/full_test_suite.py" - TEST_ARGS="btest gtest sec-hard no-dot-so util-test secp256k1 libsnark univalue" - - &docker_amd64_linux_ubuntu_xenial_rpc-tests_1 + - &docker_amd64_linux_ubuntu_focal_rpc-tests_1 env: - DOCKER_ARCH=amd64 - DOCKER_TARGET_OS=linux - - DOCKER_FROM=ubuntu_xenial + - DOCKER_FROM=ubuntu_focal - DOCKER_IS_DEB=true - TEST_CMD="./qa/zcash/full_test_suite.py" - TEST_ARGS="rpc --rpc-extended --rpc-split=3:1" - - &docker_amd64_linux_ubuntu_xenial_rpc-tests_2 + - &docker_amd64_linux_ubuntu_focal_rpc-tests_2 env: - DOCKER_ARCH=amd64 - DOCKER_TARGET_OS=linux - - DOCKER_FROM=ubuntu_xenial + - DOCKER_FROM=ubuntu_focal - DOCKER_IS_DEB=true - TEST_CMD="./qa/zcash/full_test_suite.py" - TEST_ARGS="rpc --rpc-extended --rpc-split=3:2" - - &docker_amd64_linux_ubuntu_xenial_rpc-tests_3 + - &docker_amd64_linux_ubuntu_focal_rpc-tests_3 env: - DOCKER_ARCH=amd64 - DOCKER_TARGET_OS=linux - - DOCKER_FROM=ubuntu_xenial + - DOCKER_FROM=ubuntu_focal - DOCKER_IS_DEB=true - TEST_CMD="./qa/zcash/full_test_suite.py" - TEST_ARGS="rpc --rpc-extended --rpc-split=3:3" - - &docker_amd64_linux_ubuntu_xenial_test-fetch-params + - &docker_amd64_linux_ubuntu_focal_test-fetch-params env: - DOCKER_ARCH=amd64 - DOCKER_TARGET_OS=linux - - DOCKER_FROM=ubuntu_xenial + - DOCKER_FROM=ubuntu_focal - DOCKER_IS_DEB=true - TEST_CMD="./qa/zen/test-fetch-params.sh" - &docker_amd64_linux_ubuntu_bionic_unit-tests @@ -161,10 +161,10 @@ jobs: # build and push docker build/test dependency images - stage: Prepare <<: *prepare_docker_amd64 - <<: *docker_amd64_linux_ubuntu_xenial + <<: *docker_amd64_linux_ubuntu_bionic - stage: Prepare <<: *prepare_docker_amd64 - <<: *docker_amd64_linux_ubuntu_bionic + <<: *docker_amd64_linux_ubuntu_focal - stage: Prepare <<: *prepare_docker_amd64 <<: *docker_amd64_windows_ubuntu_bionic @@ -180,10 +180,10 @@ jobs: # Docker based builds - stage: Build <<: *build_docker_amd64 - <<: *docker_amd64_linux_ubuntu_xenial + <<: *docker_amd64_linux_ubuntu_bionic - stage: Build <<: *build_docker_amd64 - <<: *docker_amd64_linux_ubuntu_bionic + <<: *docker_amd64_linux_ubuntu_focal - stage: Build <<: *build_docker_amd64 <<: *docker_amd64_windows_ubuntu_bionic @@ -202,31 +202,31 @@ jobs: # Docker based tests - stage: Test <<: *test_docker_amd64 - <<: *docker_amd64_linux_ubuntu_xenial_unit-tests + <<: *docker_amd64_linux_ubuntu_bionic_unit-tests - stage: Test <<: *test_docker_amd64 - <<: *docker_amd64_linux_ubuntu_xenial_rpc-tests_1 + <<: *docker_amd64_linux_ubuntu_bionic_rpc-tests_1 - stage: Test <<: *test_docker_amd64 - <<: *docker_amd64_linux_ubuntu_xenial_rpc-tests_2 + <<: *docker_amd64_linux_ubuntu_bionic_rpc-tests_2 - stage: Test <<: *test_docker_amd64 - <<: *docker_amd64_linux_ubuntu_xenial_rpc-tests_3 + <<: *docker_amd64_linux_ubuntu_bionic_rpc-tests_3 - stage: Test <<: *test_docker_amd64 - <<: *docker_amd64_linux_ubuntu_xenial_test-fetch-params + <<: *docker_amd64_linux_ubuntu_focal_unit-tests - stage: Test <<: *test_docker_amd64 - <<: *docker_amd64_linux_ubuntu_bionic_unit-tests + <<: *docker_amd64_linux_ubuntu_focal_rpc-tests_1 - stage: Test <<: *test_docker_amd64 - <<: *docker_amd64_linux_ubuntu_bionic_rpc-tests_1 + <<: *docker_amd64_linux_ubuntu_focal_rpc-tests_2 - stage: Test <<: *test_docker_amd64 - <<: *docker_amd64_linux_ubuntu_bionic_rpc-tests_2 + <<: *docker_amd64_linux_ubuntu_focal_rpc-tests_3 - stage: Test <<: *test_docker_amd64 - <<: *docker_amd64_linux_ubuntu_bionic_rpc-tests_3 + <<: *docker_amd64_linux_ubuntu_focal_test-fetch-params # osx based tests - stage: Test <<: *test_osx_xcode9_4 diff --git a/contrib/ci-horizen/scripts/build/build_amd64_linux_ubuntu_xenial.sh b/contrib/ci-horizen/scripts/build/build_amd64_linux_ubuntu_focal.sh similarity index 100% rename from contrib/ci-horizen/scripts/build/build_amd64_linux_ubuntu_xenial.sh rename to contrib/ci-horizen/scripts/build/build_amd64_linux_ubuntu_focal.sh From a2e1d39caef45f8dbb7e51fafd97c997c1f57d32 Mon Sep 17 00:00:00 2001 From: cronicc Date: Tue, 8 Jun 2021 14:24:13 +0000 Subject: [PATCH 04/20] Use focal host os and x-large vm size in travis linux build/test stages --- .travis.yml | 10 +++++++--- contrib/ci-horizen/scripts/common/install.sh | 10 +++++++++- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0f71616a25..6bf5ff612f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -113,14 +113,16 @@ os: linux .com.github.horizenofficial.zen.job-definitions: - &prepare_docker_amd64 os: linux - dist: bionic + dist: focal cache: false script: - bash "${TRAVIS_BUILD_DIR}/contrib/ci-horizen/scripts/prepare/docker_image_build.sh" - bash "${TRAVIS_BUILD_DIR}/contrib/ci-horizen/scripts/prepare/docker_image_deploy.sh" - &build_docker_amd64 os: linux - dist: bionic + dist: focal + vm: + size: x-large cache: directories: - "$HOME/.ccache" @@ -130,7 +132,9 @@ os: linux - &test_docker_amd64 if: env(SKIP_TESTS) != true os: linux - dist: bionic + dist: focal + vm: + size: x-large cache: directories: - "$HOME/.zcash-params" diff --git a/contrib/ci-horizen/scripts/common/install.sh b/contrib/ci-horizen/scripts/common/install.sh index 4e00584e5b..3f1643f1c6 100755 --- a/contrib/ci-horizen/scripts/common/install.sh +++ b/contrib/ci-horizen/scripts/common/install.sh @@ -4,8 +4,9 @@ set -euo pipefail if [ "${TRAVIS_OS_NAME}" = "linux" ]; then if [ ! -z "${DOCKER_UPDATE_PACKAGES}" ]; then + curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - sudo add-apt-repository "deb [arch=${TRAVIS_CPU_ARCH}] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" - UPDATE_PACKAGES="${UPDATE_PACKAGES} ${DOCKER_UPDATE_PACKAGES}" + UPDATE_PACKAGES="${UPDATE_PACKAGES}" fi if [ ! -z "${PIP_UPDATE_PACKAGES}" ] && [ ! -z "${PIP_INSTALL}" ]; then UPDATE_PACKAGES="${UPDATE_PACKAGES} ${PIP_UPDATE_PACKAGES}" @@ -13,6 +14,13 @@ if [ "${TRAVIS_OS_NAME}" = "linux" ]; then sudo apt-get update sudo apt-get -y --no-install-recommends install ${UPDATE_PACKAGES} if [ ! -z "${DOCKER_UPDATE_PACKAGES}" ]; then + sudo systemctl stop containerd.service + sudo systemctl stop docker.service + sudo systemctl stop docker.socket + sudo apt-get purge containerd docker.io runc + sudo apt-get autoremove --purge + sudo rm -f /etc/default/docker + sudo apt-get -y --no-install-recommends -o Dpkg::Options::="--force-confnew" install ${DOCKER_UPDATE_PACKAGES} ls /proc/sys/fs/binfmt_misc/ if [ "${TRAVIS_CPU_ARCH}" = "amd64" ]; then docker run --rm --privileged multiarch/qemu-user-static --reset -p yes From fe715739ebe749e3e70295ea3d512c46979526f0 Mon Sep 17 00:00:00 2001 From: cronicc Date: Tue, 8 Jun 2021 16:03:03 +0000 Subject: [PATCH 05/20] Add some buildsystem information to entrypoint.sh --- .../amd64/linux/ubuntu_bionic/entrypoint.sh | 10 ++++++++-- .../dockerfiles/amd64/linux/ubuntu_focal/entrypoint.sh | 10 ++++++++-- .../amd64/windows/ubuntu_bionic/entrypoint.sh | 10 ++++++++-- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_bionic/entrypoint.sh b/contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_bionic/entrypoint.sh index 27db4f28eb..47e87deade 100755 --- a/contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_bionic/entrypoint.sh +++ b/contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_bionic/entrypoint.sh @@ -18,10 +18,16 @@ if [ ! "$USER_ID" == "$LOCAL_UID" ] || [ ! "$GRP_ID" == "$LOCAL_GID" ]; then echo "Warning: User zenbuilder with differing UID $LOCAL_UID/GID $LOCAL_GID already exists, most likely this container was started before with a different UID/GID. Re-create it to change UID/GID." fi -echo "Starting with UID/GID: $LOCAL_UID:$LOCAL_GID" - export HOME=/home/zenbuilder +gcc -v +echo +lscpu +echo +free -h +echo +echo "Username: zenbuilder, HOME: $HOME, UID: $LOCAL_UID, GID: $LOCAL_GID" + # Mount host directories for dir in .ccache .zcash-params build; do if [ -d "/mnt/${dir}" ]; then diff --git a/contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_focal/entrypoint.sh b/contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_focal/entrypoint.sh index 27db4f28eb..47e87deade 100755 --- a/contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_focal/entrypoint.sh +++ b/contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_focal/entrypoint.sh @@ -18,10 +18,16 @@ if [ ! "$USER_ID" == "$LOCAL_UID" ] || [ ! "$GRP_ID" == "$LOCAL_GID" ]; then echo "Warning: User zenbuilder with differing UID $LOCAL_UID/GID $LOCAL_GID already exists, most likely this container was started before with a different UID/GID. Re-create it to change UID/GID." fi -echo "Starting with UID/GID: $LOCAL_UID:$LOCAL_GID" - export HOME=/home/zenbuilder +gcc -v +echo +lscpu +echo +free -h +echo +echo "Username: zenbuilder, HOME: $HOME, UID: $LOCAL_UID, GID: $LOCAL_GID" + # Mount host directories for dir in .ccache .zcash-params build; do if [ -d "/mnt/${dir}" ]; then diff --git a/contrib/ci-horizen/dockerfiles/amd64/windows/ubuntu_bionic/entrypoint.sh b/contrib/ci-horizen/dockerfiles/amd64/windows/ubuntu_bionic/entrypoint.sh index 27db4f28eb..47e87deade 100755 --- a/contrib/ci-horizen/dockerfiles/amd64/windows/ubuntu_bionic/entrypoint.sh +++ b/contrib/ci-horizen/dockerfiles/amd64/windows/ubuntu_bionic/entrypoint.sh @@ -18,10 +18,16 @@ if [ ! "$USER_ID" == "$LOCAL_UID" ] || [ ! "$GRP_ID" == "$LOCAL_GID" ]; then echo "Warning: User zenbuilder with differing UID $LOCAL_UID/GID $LOCAL_GID already exists, most likely this container was started before with a different UID/GID. Re-create it to change UID/GID." fi -echo "Starting with UID/GID: $LOCAL_UID:$LOCAL_GID" - export HOME=/home/zenbuilder +gcc -v +echo +lscpu +echo +free -h +echo +echo "Username: zenbuilder, HOME: $HOME, UID: $LOCAL_UID, GID: $LOCAL_GID" + # Mount host directories for dir in .ccache .zcash-params build; do if [ -d "/mnt/${dir}" ]; then From b6bd1f854cf5012b3d08802719f778ca78a50f05 Mon Sep 17 00:00:00 2001 From: cronicc Date: Tue, 8 Jun 2021 18:39:47 +0000 Subject: [PATCH 06/20] More Test stage parallelization --- .travis.yml | 117 +++++++++++------- .../amd64/linux/ubuntu_bionic/Dockerfile | 2 +- .../amd64/linux/ubuntu_focal/Dockerfile | 2 +- .../amd64/windows/ubuntu_bionic/Dockerfile | 2 +- .../build/build_amd64_linux_ubuntu_bionic.sh | 2 +- .../build/build_amd64_linux_ubuntu_focal.sh | 2 +- .../build_amd64_windows_ubuntu_bionic.sh | 2 +- contrib/ci-horizen/scripts/test/run_test.sh | 2 +- 8 files changed, 82 insertions(+), 49 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6bf5ff612f..b453db0337 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,12 +3,6 @@ language: shell os: linux .com.github.horizenofficial.zen.env-definitions: - - &docker_amd64_linux_ubuntu_xenial - env: - - DOCKER_ARCH=amd64 - - DOCKER_TARGET_OS=linux - - DOCKER_FROM=ubuntu_focal - - DOCKER_IS_DEB=true - &docker_amd64_linux_ubuntu_bionic env: - DOCKER_ARCH=amd64 @@ -21,77 +15,99 @@ os: linux - DOCKER_TARGET_OS=windows - DOCKER_FROM=ubuntu_bionic - DOCKER_IS_DEB=true - - &docker_amd64_linux_ubuntu_focal_unit-tests + - &docker_amd64_linux_ubuntu_focal env: - DOCKER_ARCH=amd64 - DOCKER_TARGET_OS=linux - DOCKER_FROM=ubuntu_focal - DOCKER_IS_DEB=true + - &docker_amd64_linux_ubuntu_bionic_unit-tests + env: + - DOCKER_ARCH=amd64 + - DOCKER_TARGET_OS=linux + - DOCKER_FROM=ubuntu_bionic + - DOCKER_IS_DEB=true - TEST_CMD="./qa/zcash/full_test_suite.py" - TEST_ARGS="btest gtest sec-hard no-dot-so util-test secp256k1 libsnark univalue" - - &docker_amd64_linux_ubuntu_focal_rpc-tests_1 + - &docker_amd64_linux_ubuntu_bionic_rpc-tests_1 env: - DOCKER_ARCH=amd64 - DOCKER_TARGET_OS=linux - - DOCKER_FROM=ubuntu_focal + - DOCKER_FROM=ubuntu_bionic - DOCKER_IS_DEB=true - TEST_CMD="./qa/zcash/full_test_suite.py" - - TEST_ARGS="rpc --rpc-extended --rpc-split=3:1" - - &docker_amd64_linux_ubuntu_focal_rpc-tests_2 + - TEST_ARGS="rpc --rpc-extended --rpc-split=4:1" + - &docker_amd64_linux_ubuntu_bionic_rpc-tests_2 env: - DOCKER_ARCH=amd64 - DOCKER_TARGET_OS=linux - - DOCKER_FROM=ubuntu_focal + - DOCKER_FROM=ubuntu_bionic - DOCKER_IS_DEB=true - TEST_CMD="./qa/zcash/full_test_suite.py" - - TEST_ARGS="rpc --rpc-extended --rpc-split=3:2" - - &docker_amd64_linux_ubuntu_focal_rpc-tests_3 + - TEST_ARGS="rpc --rpc-extended --rpc-split=4:2" + - &docker_amd64_linux_ubuntu_bionic_rpc-tests_3 env: - DOCKER_ARCH=amd64 - DOCKER_TARGET_OS=linux - - DOCKER_FROM=ubuntu_focal + - DOCKER_FROM=ubuntu_bionic - DOCKER_IS_DEB=true - TEST_CMD="./qa/zcash/full_test_suite.py" - - TEST_ARGS="rpc --rpc-extended --rpc-split=3:3" - - &docker_amd64_linux_ubuntu_focal_test-fetch-params + - TEST_ARGS="rpc --rpc-extended --rpc-split=4:3" + - &docker_amd64_linux_ubuntu_bionic_rpc-tests_4 env: - DOCKER_ARCH=amd64 - DOCKER_TARGET_OS=linux - - DOCKER_FROM=ubuntu_focal + - DOCKER_FROM=ubuntu_bionic - DOCKER_IS_DEB=true - - TEST_CMD="./qa/zen/test-fetch-params.sh" - - &docker_amd64_linux_ubuntu_bionic_unit-tests + - TEST_CMD="./qa/zcash/full_test_suite.py" + - TEST_ARGS="rpc --rpc-extended --rpc-split=4:4" + - &docker_amd64_linux_ubuntu_bionic_test-fetch-params env: - DOCKER_ARCH=amd64 - DOCKER_TARGET_OS=linux - DOCKER_FROM=ubuntu_bionic - DOCKER_IS_DEB=true + - TEST_CMD="./qa/zen/test-fetch-params.sh" + - &docker_amd64_linux_ubuntu_focal_unit-tests + env: + - DOCKER_ARCH=amd64 + - DOCKER_TARGET_OS=linux + - DOCKER_FROM=ubuntu_focal + - DOCKER_IS_DEB=true - TEST_CMD="./qa/zcash/full_test_suite.py" - TEST_ARGS="btest gtest sec-hard no-dot-so util-test secp256k1 libsnark univalue" - - &docker_amd64_linux_ubuntu_bionic_rpc-tests_1 + - &docker_amd64_linux_ubuntu_focal_rpc-tests_1 env: - DOCKER_ARCH=amd64 - DOCKER_TARGET_OS=linux - - DOCKER_FROM=ubuntu_bionic + - DOCKER_FROM=ubuntu_focal - DOCKER_IS_DEB=true - TEST_CMD="./qa/zcash/full_test_suite.py" - - TEST_ARGS="rpc --rpc-extended --rpc-split=3:1" - - &docker_amd64_linux_ubuntu_bionic_rpc-tests_2 + - TEST_ARGS="rpc --rpc-extended --rpc-split=4:1" + - &docker_amd64_linux_ubuntu_focal_rpc-tests_2 env: - DOCKER_ARCH=amd64 - DOCKER_TARGET_OS=linux - - DOCKER_FROM=ubuntu_bionic + - DOCKER_FROM=ubuntu_focal - DOCKER_IS_DEB=true - TEST_CMD="./qa/zcash/full_test_suite.py" - - TEST_ARGS="rpc --rpc-extended --rpc-split=3:2" - - &docker_amd64_linux_ubuntu_bionic_rpc-tests_3 + - TEST_ARGS="rpc --rpc-extended --rpc-split=4:2" + - &docker_amd64_linux_ubuntu_focal_rpc-tests_3 env: - DOCKER_ARCH=amd64 - DOCKER_TARGET_OS=linux - - DOCKER_FROM=ubuntu_bionic + - DOCKER_FROM=ubuntu_focal - DOCKER_IS_DEB=true - TEST_CMD="./qa/zcash/full_test_suite.py" - - TEST_ARGS="rpc --rpc-extended --rpc-split=3:3" + - TEST_ARGS="rpc --rpc-extended --rpc-split=4:3" + - &docker_amd64_linux_ubuntu_focal_rpc-tests_4 + env: + - DOCKER_ARCH=amd64 + - DOCKER_TARGET_OS=linux + - DOCKER_FROM=ubuntu_focal + - DOCKER_IS_DEB=true + - TEST_CMD="./qa/zcash/full_test_suite.py" + - TEST_ARGS="rpc --rpc-extended --rpc-split=4:4" - &amd64_osx_xcode9_4_unit-tests env: - TEST_CMD="./qa/zcash/full_test_suite.py" @@ -118,7 +134,7 @@ os: linux script: - bash "${TRAVIS_BUILD_DIR}/contrib/ci-horizen/scripts/prepare/docker_image_build.sh" - bash "${TRAVIS_BUILD_DIR}/contrib/ci-horizen/scripts/prepare/docker_image_deploy.sh" - - &build_docker_amd64 + - &build_docker_amd64_x-large os: linux dist: focal vm: @@ -130,6 +146,17 @@ os: linux - bash -c "${TRAVIS_BUILD_DIR}/contrib/ci-horizen/scripts/build/build_${TRAVIS_CPU_ARCH}_${DOCKER_TARGET_OS}_${DOCKER_FROM}.sh" - bash -c "${TRAVIS_BUILD_DIR}/contrib/ci-horizen/scripts/common/push_archive.sh ${B2_UL_COMPRESS_FOLDER} ${B2_UL_FILENAME}" - &test_docker_amd64 + if: env(SKIP_TESTS) != true + os: linux + dist: focal + cache: + directories: + - "$HOME/.zcash-params" + script: + - bash -c "RENAME_FOLDER='true' RENAME_SUFFIX='_clean' ${TRAVIS_BUILD_DIR}/contrib/ci-horizen/scripts/common/get_archive.sh ${B2_DL_DECOMPRESS_FOLDER} ${B2_DL_FILENAME}" + - bash -c "${TRAVIS_BUILD_DIR}/contrib/ci-horizen/scripts/common/travis_stay_alive.sh" + - bash -c '${TRAVIS_BUILD_DIR}/contrib/ci-horizen/scripts/test/run_test.sh "${TEST_CMD}" "${TEST_ARGS}"' + - &test_docker_amd64_x-large if: env(SKIP_TESTS) != true os: linux dist: focal @@ -183,13 +210,13 @@ jobs: - bash -c "${TRAVIS_BUILD_DIR}/contrib/ci-horizen/scripts/common/push_archive.sh ${B2_UL_COMPRESS_FOLDER} ${B2_UL_FILENAME}" # Docker based builds - stage: Build - <<: *build_docker_amd64 + <<: *build_docker_amd64_x-large <<: *docker_amd64_linux_ubuntu_bionic - stage: Build - <<: *build_docker_amd64 + <<: *build_docker_amd64_x-large <<: *docker_amd64_linux_ubuntu_focal - stage: Build - <<: *build_docker_amd64 + <<: *build_docker_amd64_x-large <<: *docker_amd64_windows_ubuntu_bionic # osx build - stage: Build @@ -205,32 +232,38 @@ jobs: - bash -c "${TRAVIS_BUILD_DIR}/contrib/ci-horizen/scripts/common/push_archive.sh ${B2_UL_COMPRESS_FOLDER} ${B2_UL_FILENAME}" # Docker based tests - stage: Test - <<: *test_docker_amd64 + <<: *test_docker_amd64_x-large <<: *docker_amd64_linux_ubuntu_bionic_unit-tests - stage: Test - <<: *test_docker_amd64 + <<: *test_docker_amd64_x-large <<: *docker_amd64_linux_ubuntu_bionic_rpc-tests_1 - stage: Test - <<: *test_docker_amd64 + <<: *test_docker_amd64_x-large <<: *docker_amd64_linux_ubuntu_bionic_rpc-tests_2 - stage: Test - <<: *test_docker_amd64 + <<: *test_docker_amd64_x-large <<: *docker_amd64_linux_ubuntu_bionic_rpc-tests_3 + - stage: Test + <<: *test_docker_amd64_x-large + <<: *docker_amd64_linux_ubuntu_bionic_rpc-tests_4 - stage: Test <<: *test_docker_amd64 + <<: *docker_amd64_linux_ubuntu_bionic_test-fetch-params + - stage: Test + <<: *test_docker_amd64_x-large <<: *docker_amd64_linux_ubuntu_focal_unit-tests - stage: Test - <<: *test_docker_amd64 + <<: *test_docker_amd64_x-large <<: *docker_amd64_linux_ubuntu_focal_rpc-tests_1 - stage: Test - <<: *test_docker_amd64 + <<: *test_docker_amd64_x-large <<: *docker_amd64_linux_ubuntu_focal_rpc-tests_2 - stage: Test - <<: *test_docker_amd64 + <<: *test_docker_amd64_x-large <<: *docker_amd64_linux_ubuntu_focal_rpc-tests_3 - stage: Test - <<: *test_docker_amd64 - <<: *docker_amd64_linux_ubuntu_focal_test-fetch-params + <<: *test_docker_amd64_x-large + <<: *docker_amd64_linux_ubuntu_focal_rpc-tests_4 # osx based tests - stage: Test <<: *test_osx_xcode9_4 diff --git a/contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_bionic/Dockerfile b/contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_bionic/Dockerfile index 864536ee89..9c927ab0eb 100644 --- a/contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_bionic/Dockerfile +++ b/contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_bionic/Dockerfile @@ -14,7 +14,7 @@ RUN set -euxo pipefail \ && apt-get -y --no-install-recommends install aria2 autoconf automake bsdmainutils build-essential \ ca-certificates cmake curl dirmngr fakeroot git g++-multilib gnupg2 help2man libc6-dev libgomp1 \ libtool lintian m4 ncurses-dev pigz pkg-config pv python-dev python-pip python-setuptools \ - python-wheel python-wheel-common python-zmq unzip wget zlib1g-dev \ + python-wheel python-wheel-common python-zmq time unzip wget zlib1g-dev \ && pip install b2==1.4.2 pyblake2 websocket-client2 \ && BASEURL="https://github.com/tianon/gosu/releases/download/" \ && GOSU_VERSION="1.13" \ diff --git a/contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_focal/Dockerfile b/contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_focal/Dockerfile index 1b6cf5c7e4..c4a58dd593 100644 --- a/contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_focal/Dockerfile +++ b/contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_focal/Dockerfile @@ -13,7 +13,7 @@ RUN set -euxo pipefail \ && apt-get -y --no-install-recommends dist-upgrade \ && apt-get -y --no-install-recommends install aria2 autoconf automake bsdmainutils build-essential \ ca-certificates cmake curl dirmngr fakeroot git g++-multilib gnupg2 help2man libc6-dev libgomp1 \ - libtool lintian m4 ncurses-dev pigz pkg-config pv python2-dev python-setuptools unzip wget zlib1g-dev \ + libtool lintian m4 ncurses-dev pigz pkg-config pv python2-dev python-setuptools time unzip wget zlib1g-dev \ && curl -s https://bootstrap.pypa.io/pip/2.7/get-pip.py | python2 \ && pip2 install b2==1.4.2 pyblake2 pyzmq websocket-client2 \ && BASEURL="https://github.com/tianon/gosu/releases/download/" \ diff --git a/contrib/ci-horizen/dockerfiles/amd64/windows/ubuntu_bionic/Dockerfile b/contrib/ci-horizen/dockerfiles/amd64/windows/ubuntu_bionic/Dockerfile index 380e591983..39d864bc03 100644 --- a/contrib/ci-horizen/dockerfiles/amd64/windows/ubuntu_bionic/Dockerfile +++ b/contrib/ci-horizen/dockerfiles/amd64/windows/ubuntu_bionic/Dockerfile @@ -14,7 +14,7 @@ RUN set -euxo pipefail \ && apt-get -y --no-install-recommends install aria2 autoconf automake bsdmainutils build-essential \ ca-certificates cmake curl dirmngr git g++-multilib gnupg2 help2man libc6-dev libgomp1 libtool \ m4 mingw-w64 ncurses-dev pigz pkg-config pv python-minimal python-pip python-setuptools python-wheel \ - python-wheel-common unzip wget zlib1g-dev \ + python-wheel-common time unzip wget zlib1g-dev \ && pip install b2==1.4.2 \ && BASEURL="https://github.com/tianon/gosu/releases/download/" \ && GOSU_VERSION="1.13" \ diff --git a/contrib/ci-horizen/scripts/build/build_amd64_linux_ubuntu_bionic.sh b/contrib/ci-horizen/scripts/build/build_amd64_linux_ubuntu_bionic.sh index f55ec5ae70..370d893f2c 100755 --- a/contrib/ci-horizen/scripts/build/build_amd64_linux_ubuntu_bionic.sh +++ b/contrib/ci-horizen/scripts/build/build_amd64_linux_ubuntu_bionic.sh @@ -5,4 +5,4 @@ set -euo pipefail docker run --rm -v "${TRAVIS_BUILD_DIR}:/mnt/build" -v "$HOME/.ccache:/mnt/.ccache" -e LOCAL_USER_ID="$(id -u)" \ -e LOCAL_GRP_ID="$(id -g)" --env-file <(env | grep 'DOCKER_') "${IMAGE_NAME}:${IMAGE_TAG}" \ bash -c 'set -xeuo pipefail && export HOST="$(gcc -dumpmachine)" && export MAKEFLAGS="-j $(($(nproc)+1))" \ - && cd "${DOCKER_HOME}" && time ./zcutil/build.sh $MAKEFLAGS' + && cd "${DOCKER_HOME}" && /usr/bin/time -v ./zcutil/build.sh $MAKEFLAGS' diff --git a/contrib/ci-horizen/scripts/build/build_amd64_linux_ubuntu_focal.sh b/contrib/ci-horizen/scripts/build/build_amd64_linux_ubuntu_focal.sh index f55ec5ae70..370d893f2c 100755 --- a/contrib/ci-horizen/scripts/build/build_amd64_linux_ubuntu_focal.sh +++ b/contrib/ci-horizen/scripts/build/build_amd64_linux_ubuntu_focal.sh @@ -5,4 +5,4 @@ set -euo pipefail docker run --rm -v "${TRAVIS_BUILD_DIR}:/mnt/build" -v "$HOME/.ccache:/mnt/.ccache" -e LOCAL_USER_ID="$(id -u)" \ -e LOCAL_GRP_ID="$(id -g)" --env-file <(env | grep 'DOCKER_') "${IMAGE_NAME}:${IMAGE_TAG}" \ bash -c 'set -xeuo pipefail && export HOST="$(gcc -dumpmachine)" && export MAKEFLAGS="-j $(($(nproc)+1))" \ - && cd "${DOCKER_HOME}" && time ./zcutil/build.sh $MAKEFLAGS' + && cd "${DOCKER_HOME}" && /usr/bin/time -v ./zcutil/build.sh $MAKEFLAGS' diff --git a/contrib/ci-horizen/scripts/build/build_amd64_windows_ubuntu_bionic.sh b/contrib/ci-horizen/scripts/build/build_amd64_windows_ubuntu_bionic.sh index d7bff2dc99..cea5b9a067 100755 --- a/contrib/ci-horizen/scripts/build/build_amd64_windows_ubuntu_bionic.sh +++ b/contrib/ci-horizen/scripts/build/build_amd64_windows_ubuntu_bionic.sh @@ -5,4 +5,4 @@ set -euo pipefail docker run --rm -v "${TRAVIS_BUILD_DIR}:/mnt/build" -v "$HOME/.ccache:/mnt/.ccache" -e LOCAL_USER_ID="$(id -u)" \ -e LOCAL_GRP_ID="$(id -g)" --env-file <(env | grep 'DOCKER_') "${IMAGE_NAME}:${IMAGE_TAG}" \ bash -c 'set -xeuo pipefail && export HOST=x86_64-w64-mingw32 && export MAKEFLAGS="-j $(($(nproc)+1))" \ - && cd "${DOCKER_HOME}" && time ./zcutil/build.sh $MAKEFLAGS' + && cd "${DOCKER_HOME}" && /usr/bin/time -v ./zcutil/build.sh $MAKEFLAGS' diff --git a/contrib/ci-horizen/scripts/test/run_test.sh b/contrib/ci-horizen/scripts/test/run_test.sh index 0f0bdc2ade..0ed6e5bc38 100755 --- a/contrib/ci-horizen/scripts/test/run_test.sh +++ b/contrib/ci-horizen/scripts/test/run_test.sh @@ -17,5 +17,5 @@ else -e LOCAL_USER_ID="$(id -u)" -e LOCAL_GRP_ID="$(id -g)" -e CMD -e ARGS \ --env-file <(env | grep 'DOCKER_\|B2_\|TEST_\|TRAVIS_') --network=dockerbridge "${IMAGE_NAME}:${IMAGE_TAG}" \ bash -c 'set -xeuo pipefail && export HOST=$(gcc -dumpmachine) \ - && export MAKEFLAGS="-j $(($(nproc)+1))" && cd "${DOCKER_HOME}" && ./zcutil/fetch-params.sh && time "${CMD}" ${ARGS}' + && export MAKEFLAGS="-j $(($(nproc)+1))" && cd "${DOCKER_HOME}" && ./zcutil/fetch-params.sh && /usr/bin/time -v "${CMD}" ${ARGS}' fi From 17573f2cd1ef11ef9a72a833a2048176b898c397 Mon Sep 17 00:00:00 2001 From: cronicc Date: Tue, 6 Jul 2021 11:33:05 +0000 Subject: [PATCH 07/20] Add more fallback gpg2 servers for key fetch to Dockerfiles --- .../dockerfiles/amd64/linux/ubuntu_bionic/Dockerfile | 4 +++- .../dockerfiles/amd64/linux/ubuntu_focal/Dockerfile | 4 +++- .../dockerfiles/amd64/windows/ubuntu_bionic/Dockerfile | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_bionic/Dockerfile b/contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_bionic/Dockerfile index 9c927ab0eb..d8d28317c6 100644 --- a/contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_bionic/Dockerfile +++ b/contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_bionic/Dockerfile @@ -22,7 +22,9 @@ RUN set -euxo pipefail \ && curl -o /usr/local/bin/gosu -SL "${BASEURL}/${GOSU_VERSION}/gosu-${DPKG_ARCH}" \ && curl -o /usr/local/bin/gosu.asc -SL "${BASEURL}/${GOSU_VERSION}/gosu-${DPKG_ARCH}.asc" \ && export GNUPGHOME="$(mktemp -d)" \ - && ( gpg2 --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \ + && ( gpg2 --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \ + gpg2 --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \ + gpg2 --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \ gpg2 --batch --keyserver hkp://ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \ gpg2 --batch --keyserver pgp.mit.edu --recv-key B42F6819007F00F88E364FD4036A9C25BF357DD4 || \ gpg2 --batch --keyserver keyserver.pgp.com --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \ diff --git a/contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_focal/Dockerfile b/contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_focal/Dockerfile index c4a58dd593..0a71ac7c40 100644 --- a/contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_focal/Dockerfile +++ b/contrib/ci-horizen/dockerfiles/amd64/linux/ubuntu_focal/Dockerfile @@ -22,7 +22,9 @@ RUN set -euxo pipefail \ && curl -o /usr/local/bin/gosu -SL "${BASEURL}/${GOSU_VERSION}/gosu-${DPKG_ARCH}" \ && curl -o /usr/local/bin/gosu.asc -SL "${BASEURL}/${GOSU_VERSION}/gosu-${DPKG_ARCH}.asc" \ && export GNUPGHOME="$(mktemp -d)" \ - && ( gpg2 --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \ + && ( gpg2 --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \ + gpg2 --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \ + gpg2 --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \ gpg2 --batch --keyserver hkp://ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \ gpg2 --batch --keyserver pgp.mit.edu --recv-key B42F6819007F00F88E364FD4036A9C25BF357DD4 || \ gpg2 --batch --keyserver keyserver.pgp.com --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \ diff --git a/contrib/ci-horizen/dockerfiles/amd64/windows/ubuntu_bionic/Dockerfile b/contrib/ci-horizen/dockerfiles/amd64/windows/ubuntu_bionic/Dockerfile index 39d864bc03..22206b3b35 100644 --- a/contrib/ci-horizen/dockerfiles/amd64/windows/ubuntu_bionic/Dockerfile +++ b/contrib/ci-horizen/dockerfiles/amd64/windows/ubuntu_bionic/Dockerfile @@ -22,7 +22,9 @@ RUN set -euxo pipefail \ && curl -o /usr/local/bin/gosu -SL "${BASEURL}/${GOSU_VERSION}/gosu-${DPKG_ARCH}" \ && curl -o /usr/local/bin/gosu.asc -SL "${BASEURL}/${GOSU_VERSION}/gosu-${DPKG_ARCH}.asc" \ && export GNUPGHOME="$(mktemp -d)" \ - && ( gpg2 --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \ + && ( gpg2 --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \ + gpg2 --batch --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \ + gpg2 --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \ gpg2 --batch --keyserver hkp://ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \ gpg2 --batch --keyserver pgp.mit.edu --recv-key B42F6819007F00F88E364FD4036A9C25BF357DD4 || \ gpg2 --batch --keyserver keyserver.pgp.com --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \ From 21a532166a0607769586a2df9a1ff6d74fbddf24 Mon Sep 17 00:00:00 2001 From: cronicc Date: Tue, 6 Jul 2021 12:35:25 +0000 Subject: [PATCH 08/20] Always login to hub.docker.com with read only account, even when only pulling --- contrib/ci-horizen/scripts/common/install.sh | 8 +++----- contrib/ci-horizen/scripts/common/setup_environment.sh | 8 ++++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/contrib/ci-horizen/scripts/common/install.sh b/contrib/ci-horizen/scripts/common/install.sh index 3f1643f1c6..8aefa0892d 100755 --- a/contrib/ci-horizen/scripts/common/install.sh +++ b/contrib/ci-horizen/scripts/common/install.sh @@ -3,17 +3,15 @@ set -euo pipefail if [ "${TRAVIS_OS_NAME}" = "linux" ]; then - if [ ! -z "${DOCKER_UPDATE_PACKAGES}" ]; then - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - - sudo add-apt-repository "deb [arch=${TRAVIS_CPU_ARCH}] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" - UPDATE_PACKAGES="${UPDATE_PACKAGES}" - fi if [ ! -z "${PIP_UPDATE_PACKAGES}" ] && [ ! -z "${PIP_INSTALL}" ]; then UPDATE_PACKAGES="${UPDATE_PACKAGES} ${PIP_UPDATE_PACKAGES}" fi sudo apt-get update sudo apt-get -y --no-install-recommends install ${UPDATE_PACKAGES} if [ ! -z "${DOCKER_UPDATE_PACKAGES}" ]; then + curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - + sudo add-apt-repository "deb [arch=${TRAVIS_CPU_ARCH}] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" + sudo apt-get update sudo systemctl stop containerd.service sudo systemctl stop docker.service sudo systemctl stop docker.socket diff --git a/contrib/ci-horizen/scripts/common/setup_environment.sh b/contrib/ci-horizen/scripts/common/setup_environment.sh index a9d4277511..50decde011 100755 --- a/contrib/ci-horizen/scripts/common/setup_environment.sh +++ b/contrib/ci-horizen/scripts/common/setup_environment.sh @@ -55,6 +55,8 @@ if [ "${TRAVIS_OS_NAME}" = "linux" ]; then NEED_GH_CREDS="true" NEED_PGP_SIGN_CREDS="true" fi + # due to new ratelimiting on hub.docker.com always login, we use a service account that has no push permissions + echo "$DOCKER_READONLY_PASSWORD" | docker login -u "$DOCKER_READONLY_USERNAME" --password-stdin fi if [ "${TRAVIS_OS_NAME}" = "osx" ]; then @@ -139,4 +141,10 @@ if [ "${NEED_PGP_SIGN_CREDS}" = "false" ]; then unset PGP_KEY_PASSWORD fi +# clear credentials after use +export DOCKER_READONLY_USERNAME="" +export DOCKER_READONLY_PASSWORD="" +unset DOCKER_READONLY_USERNAME +unset DOCKER_READONLY_PASSWORD + set +u From 4fd1efd72ca9bf903a37f22ac1362f6403c72e2f Mon Sep 17 00:00:00 2001 From: cronicc Date: Wed, 29 Sep 2021 10:41:37 +0000 Subject: [PATCH 09/20] Change interpreter to python2 --- src/test/bitcoin-util-test.py | 2 +- src/test/buildenv.py.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/bitcoin-util-test.py b/src/test/bitcoin-util-test.py index 20afb16a9e..9323614011 100755 --- a/src/test/bitcoin-util-test.py +++ b/src/test/bitcoin-util-test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # Copyright 2014 BitPay, Inc. # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/buildenv.py.in b/src/test/buildenv.py.in index 1618bdeb76..60fe5c2802 100644 --- a/src/test/buildenv.py.in +++ b/src/test/buildenv.py.in @@ -1,2 +1,2 @@ -#!/usr/bin/python +#!/usr/bin/env python2 exeext="@EXEEXT@" From 42648e80ad4803e92165b0acef09295a74f91260 Mon Sep 17 00:00:00 2001 From: cronicc Date: Thu, 30 Sep 2021 09:23:16 +0000 Subject: [PATCH 10/20] Update python interpreter workaround for MacOS tests --- contrib/ci-horizen/scripts/test/run_test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/ci-horizen/scripts/test/run_test.sh b/contrib/ci-horizen/scripts/test/run_test.sh index 0ed6e5bc38..ecc95125f5 100755 --- a/contrib/ci-horizen/scripts/test/run_test.sh +++ b/contrib/ci-horizen/scripts/test/run_test.sh @@ -8,7 +8,7 @@ export ARGS="$2" if [ "${TRAVIS_OS_NAME}" = "osx" ]; then # workaround until https://github.com/zcash/zcash/pull/3538 is pulled in from upstream # or the work porting the test suite to python3 is pulled in - find "${TRAVIS_BUILD_DIR}/qa" -type f -name *.py | LC_ALL=C xargs sed -i '' 's/env python2/env python/' + find "${TRAVIS_BUILD_DIR}/qa" "${TRAVIS_BUILD_DIR}/src/test" -type f -name *.py | LC_ALL=C xargs sed -i '' 's/env python2/env python/' bash -c 'set -xeuo pipefail && export HOST=$(gcc -dumpmachine) && export MAKEFLAGS="-j $(($(nproc)+1))" \ && cd "${TRAVIS_BUILD_DIR}" && ./zcutil/fetch-params.sh && time "${CMD}" ${ARGS}' else @@ -17,5 +17,5 @@ else -e LOCAL_USER_ID="$(id -u)" -e LOCAL_GRP_ID="$(id -g)" -e CMD -e ARGS \ --env-file <(env | grep 'DOCKER_\|B2_\|TEST_\|TRAVIS_') --network=dockerbridge "${IMAGE_NAME}:${IMAGE_TAG}" \ bash -c 'set -xeuo pipefail && export HOST=$(gcc -dumpmachine) \ - && export MAKEFLAGS="-j $(($(nproc)+1))" && cd "${DOCKER_HOME}" && ./zcutil/fetch-params.sh && /usr/bin/time -v "${CMD}" ${ARGS}' + && export MAKEFLAGS="-j $(($(nproc)+1))" && cd "${DOCKER_HOME}" && ./zcutil/fetch-params.sh && time "${CMD}" ${ARGS}' fi From 6f267f7c24dfdf80839ab965c43e3542b6fcd89c Mon Sep 17 00:00:00 2001 From: cronicc Date: Mon, 4 Oct 2021 10:15:59 +0000 Subject: [PATCH 11/20] Set version 2.0.24 --- configure.ac | 2 +- src/clientversion.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index b39a269677..348e8cd112 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 2) define(_CLIENT_VERSION_MINOR, 0) -define(_CLIENT_VERSION_REVISION, 23) +define(_CLIENT_VERSION_REVISION, 24) define(_CLIENT_VERSION_BUILD, 50) define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50))) define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1))) diff --git a/src/clientversion.h b/src/clientversion.h index e8b6102ca3..29dbff9ac2 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -34,7 +34,7 @@ //! These need to be macros, as clientversion.cpp's and bitcoin*-res.rc's voodoo requires it #define CLIENT_VERSION_MAJOR 2 #define CLIENT_VERSION_MINOR 0 -#define CLIENT_VERSION_REVISION 23 +#define CLIENT_VERSION_REVISION 24 #define CLIENT_VERSION_BUILD 50 //! Set to true for release, false for prerelease or test build From 32be6389670c49d1f32b070f3842ada875ad65b9 Mon Sep 17 00:00:00 2001 From: cronicc Date: Mon, 4 Oct 2021 10:27:10 +0000 Subject: [PATCH 12/20] Add checkpoint blocks --- src/chainparams.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 4546dd9477..a3acec6c77 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -151,11 +151,12 @@ class CMainParams : public CChainParams { ( 671000, uint256S("0x00000000097174dacaf850075917d1a24145fce88a800881ece709bb8f8746cf")) ( 724100, uint256S("0x000000000ab34fd9c61be9f10a11a97f63a0f26c8f530e67a6397fb9934709dc")) ( 812000, uint256S("0x0000000000bccf70e0d2caa0473279decddb798f456d5a4bb399898e00eb4ce9")) - ( 902500, uint256S("0x0000000001258f2009278d042ed42dfd825de9a2bc31e410c0463bc8d6371ee4")), - 1616416937, // * UNIX timestamp of last checkpoint block - 20635475, // * total number of transactions between genesis and last checkpoint + ( 902500, uint256S("0x0000000001258f2009278d042ed42dfd825de9a2bc31e410c0463bc8d6371ee4")) + ( 1014400, uint256S("0x00000000001564ef09ddc49728c4c44701fd348c418ced0ee9f656660cc08e3a")), + 1633340596, // * UNIX timestamp of last checkpoint block + 24365699, // * total number of transactions between genesis and last checkpoint // (the tx=... number in the SetBestChain debug.log lines) - 13170 // * estimated number of transactions per day after checkpoint + 13836 // * estimated number of transactions per day after checkpoint // total number of tx / (checkpoint block height / (24 * 24)) }; @@ -249,11 +250,12 @@ class CTestNetParams : public CMainParams { (595000, uint256S("0x0000da85ddc79fdd297e996d6b6b887fc5b345619b7a6726c496941dcf830966")) (643000, uint256S("0x0000cabf39e3ac435d54b95c32e6173d6bb1b060066ecb7453d2146a0dd40947")) (729000, uint256S("0x00013f6d5315f29094287bf0981b177098c5d467422bc4ab7764f88f11333f5f")) - (816500, uint256S("0x0004c69745c68058fb35b2a8e090887500f71f7e107f0fd6f3e57d21afa5fe76")), - 1616382308, // * UNIX timestamp of last checkpoint block - 1642547, // * total number of transactions between genesis and last checkpoint + (816500, uint256S("0x0004c69745c68058fb35b2a8e090887500f71f7e107f0fd6f3e57d21afa5fe76")) + (926224, uint256S("0x0001bbe15a4dc7b4c580ba3211c0d074d5716a0eb924d228440f88e0dfc23248")), // last block before zendoo hard fork activation + 1632938878, // * UNIX timestamp of last checkpoint block + 1755729, // * total number of transactions between genesis and last checkpoint // (the tx=... number in the SetBestChain debug.log lines) - 1158 // total number of tx / (checkpoint block height / (24 * 24)) + 1091 // total number of tx / (checkpoint block height / (24 * 24)) }; // commented out - seems to make no sense but kept around for reference just in case From f32f62ce60953ca9c2ae9b0f8931c4a0902693be Mon Sep 17 00:00:00 2001 From: cronicc Date: Mon, 4 Oct 2021 10:27:54 +0000 Subject: [PATCH 13/20] Update version in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8da25ad910..f69317fe37 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Zen 2.0.23 +Zen 2.0.24 ============== What is Horizen? From d0f40cdc2a30ec2924a4194dfe0ad8dbc154a072 Mon Sep 17 00:00:00 2001 From: cronicc Date: Mon, 27 Sep 2021 09:58:37 +0000 Subject: [PATCH 14/20] Update Debian package info --- contrib/debian/changelog | 6 +++--- zcutil/build-debian-package.sh | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/contrib/debian/changelog b/contrib/debian/changelog index d59450f334..0522ac9781 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,5 +1,5 @@ -zen (2.0.15) stable; urgency=medium +zen (2.0.24) stable; urgency=medium - * 2.0.15 release. + * new release - -- Zen Blockchain Foundation Thu, 27 Sep 2018 23:00:00 +0200 + -- Zen Blockchain Foundation Mon, 04 Oct 2021 10:31:57 +0000 diff --git a/zcutil/build-debian-package.sh b/zcutil/build-debian-package.sh index bfa9722947..fd1ba4cd9a 100755 --- a/zcutil/build-debian-package.sh +++ b/zcutil/build-debian-package.sh @@ -46,7 +46,8 @@ cp $SRC_PATH/src/zend $DEB_BIN cp $SRC_PATH/src/zen-cli $DEB_BIN cp $SRC_PATH/zcutil/fetch-params.sh $DEB_BIN/zen-fetch-params # Copy docs -cp $SRC_PATH/doc/release-notes/release-notes-1.0.0.md $DEB_DOC/changelog +cp $SRC_PATH/doc/release-notes/release-notes-$(cut -d "-" -f 1-2 <<<${PACKAGE_VERSION})* $DEB_DOC/changelog || +cp "$(ls -v $SRC_PATH/doc/release-notes/release-notes-* | tail -n1)" $DEB_DOC/changelog cp $SRC_DEB/changelog $DEB_DOC/changelog.Debian cp $SRC_DEB/copyright $DEB_DOC cp -r $SRC_DEB/examples $DEB_DOC From c46809b30d5ac8c49ccd495407ba8c21adfff0a1 Mon Sep 17 00:00:00 2001 From: cronicc Date: Tue, 7 Sep 2021 11:54:31 +0000 Subject: [PATCH 15/20] Update OpenSSL to 1.1.1l --- depends/packages/openssl.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/depends/packages/openssl.mk b/depends/packages/openssl.mk index ad32c1eef0..325ebb7de3 100644 --- a/depends/packages/openssl.mk +++ b/depends/packages/openssl.mk @@ -1,8 +1,8 @@ package=openssl -$(package)_version=1.1.1k +$(package)_version=1.1.1l $(package)_download_path=https://www.openssl.org/source $(package)_file_name=$(package)-$($(package)_version).tar.gz -$(package)_sha256_hash=892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5 +$(package)_sha256_hash=0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1 define $(package)_set_vars $(package)_config_env=AR="$($(package)_ar)" RANLIB="$($(package)_ranlib)" CC="$($(package)_cc)" From df6b74cdab481e87d3fe470161bd90b018473e17 Mon Sep 17 00:00:00 2001 From: cronicc Date: Mon, 4 Oct 2021 10:45:48 +0000 Subject: [PATCH 16/20] Set deprecation height 1047600/2021-12-1 --- src/deprecation.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/deprecation.h b/src/deprecation.h index 68b6d62767..ff846efcf6 100644 --- a/src/deprecation.h +++ b/src/deprecation.h @@ -5,8 +5,8 @@ #ifndef ZCASH_DEPRECATION_H #define ZCASH_DEPRECATION_H -static const int APPROX_RELEASE_HEIGHT = 906540; -static const int WEEKS_UNTIL_DEPRECATION = 30; +static const int APPROX_RELEASE_HEIGHT = 1019376; +static const int WEEKS_UNTIL_DEPRECATION = 7; static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 24); // Number of blocks before deprecation to warn users From 01f45daf1d68db74c040d846bdf048859cfa5ea9 Mon Sep 17 00:00:00 2001 From: cronicc Date: Mon, 4 Oct 2021 12:17:54 +0000 Subject: [PATCH 17/20] Update manpages --- doc/man/zen-cli.1 | 6 +++--- doc/man/zen-tx.1 | 6 +++--- doc/man/zend.1 | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/doc/man/zen-cli.1 b/doc/man/zen-cli.1 index 94541641ed..86806ab9ed 100644 --- a/doc/man/zen-cli.1 +++ b/doc/man/zen-cli.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. -.TH ZEN-CLI "1" "March 2021" "zen-cli v2.0.23" "User Commands" +.TH ZEN-CLI "1" "October 2021" "zen-cli v2.0.24" "User Commands" .SH NAME -zen-cli \- manual page for zen-cli v2.0.23 +zen-cli \- manual page for zen-cli v2.0.24 .SH DESCRIPTION -Horizen RPC client version v2.0.23 +Horizen RPC client version v2.0.24 .SS "Usage:" .TP zen\-cli [options] [params] diff --git a/doc/man/zen-tx.1 b/doc/man/zen-tx.1 index e3c4849608..5f3690f8d8 100644 --- a/doc/man/zen-tx.1 +++ b/doc/man/zen-tx.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. -.TH ZEN-TX "1" "March 2021" "zen-tx v2.0.23" "User Commands" +.TH ZEN-TX "1" "October 2021" "zen-tx v2.0.24" "User Commands" .SH NAME -zen-tx \- manual page for zen-tx v2.0.23 +zen-tx \- manual page for zen-tx v2.0.24 .SH DESCRIPTION -Zencash zen\-tx utility version v2.0.23 +Zencash zen\-tx utility version v2.0.24 .SS "Usage:" .TP zen\-tx [options] [commands] diff --git a/doc/man/zend.1 b/doc/man/zend.1 index 9bde80f850..320b145235 100644 --- a/doc/man/zend.1 +++ b/doc/man/zend.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. -.TH ZEND "1" "March 2021" "zend v2.0.23" "User Commands" +.TH ZEND "1" "October 2021" "zend v2.0.24" "User Commands" .SH NAME -zend \- manual page for zend v2.0.23 +zend \- manual page for zend v2.0.24 .SH DESCRIPTION -Zen Daemon version v2.0.23 +Zen Daemon version v2.0.24 .SS "Usage:" .TP zend [options] @@ -51,7 +51,7 @@ Specify data directory \fB\-disabledeprecation=\fR .IP Disable block\-height node deprecation and automatic shutdown (example: -\fB\-disabledeprecation\fR=\fI\,2\/\fR.0.23) +\fB\-disabledeprecation\fR=\fI\,2\/\fR.0.24) .HP \fB\-exportdir=\fR .IP @@ -503,8 +503,8 @@ Password for JSON\-RPC connections .HP \fB\-rpcport=\fR .IP -Listen for JSON\-RPC connections on (default: 8232 or testnet: -18232) +Listen for JSON\-RPC connections on (default: 8231 or testnet: +18231) .HP \fB\-rpcallowip=\fR .IP From d14f3669459110d01afc387cdbb0120724f28e30 Mon Sep 17 00:00:00 2001 From: cronicc Date: Mon, 4 Oct 2021 12:19:28 +0000 Subject: [PATCH 18/20] Update changelog --- doc/authors.md | 3 +- doc/release-notes/release-notes-2.0.24.md | 38 +++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 doc/release-notes/release-notes-2.0.24.md diff --git a/doc/authors.md b/doc/authors.md index fe653a49a7..e5b58a6639 100644 --- a/doc/authors.md +++ b/doc/authors.md @@ -5,8 +5,8 @@ Jack Grigg (773) Simon Liu (338) FranckDG (219) Sean Bowe (204) +cronicc (155) Daira Hopwood (142) -cronicc (136) Wladimir J. van der Laan (122) Nathan Wilcox (106) Jay Graber (75) @@ -23,6 +23,7 @@ Pieter Wuille (24) joshuayabut (20) nomnombtc (18) Paige Peterson (13) +luisantoniocrag (12) fanquake (12) Luke Dashjr (12) MarcoFalke (11) diff --git a/doc/release-notes/release-notes-2.0.24.md b/doc/release-notes/release-notes-2.0.24.md new file mode 100644 index 0000000000..38e116a617 --- /dev/null +++ b/doc/release-notes/release-notes-2.0.24.md @@ -0,0 +1,38 @@ +Changelog +========= + +cronicc (19): + Update about section in README.md + Change user agent in help messages from 'MagicBean' to 'zen' + Add websocket-client python test dependency + Update CI builder dockerfiles: + Replace xenial with focal builder in travis + Use focal host os and x-large vm size in travis linux build/test stages + Add some buildsystem information to entrypoint.sh + More Test stage parallelization + Add more fallback gpg2 servers for key fetch to Dockerfiles + Always login to hub.docker.com with read only account, even when only pulling + Change interpreter to python2 + Update python interpreter workaround for MacOS tests + Set version 2.0.24 + Add checkpoint blocks + Update version in readme + Update Debian package info + Update OpenSSL to 1.1.1l + Set deprecation height 1047600/2021-12-1 + Update manpages + +luisantoniocrag (12): + Fix RPC misc call help messages + Fix RPC blockchain call help messages + Fix RPC mining call help messages + Fix RPC net call help messages + Fix RPC rawtransaction call help messages + Fix RPC rpcdisclosure call help messages + Fix RPC server call help messages + Fix RPC rpcdump call help messages + Fix RPC rpcwallet call help messages + Fix misc rpc help messages + Fix rpcwallet + Update src/rpc/blockchain.cpp + From 7e75c2f2d910f7494e68aab6624b6571ac44f936 Mon Sep 17 00:00:00 2001 From: cronicc Date: Mon, 4 Oct 2021 17:53:03 +0000 Subject: [PATCH 19/20] Pull in patch fixing OpenSSL build error on older MacOS: https://github.com/openssl/openssl/commit/96ac8f13f4d0ee96baf5724d9f96c44c34b8606c --- depends/packages/openssl.mk | 4 +- ...allows-to-build-on-releases-before-Y.patch | 63 +++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 depends/patches/openssl/0001-Darwin-platform-allows-to-build-on-releases-before-Y.patch diff --git a/depends/packages/openssl.mk b/depends/packages/openssl.mk index 325ebb7de3..8fd854f433 100644 --- a/depends/packages/openssl.mk +++ b/depends/packages/openssl.mk @@ -3,6 +3,7 @@ $(package)_version=1.1.1l $(package)_download_path=https://www.openssl.org/source $(package)_file_name=$(package)-$($(package)_version).tar.gz $(package)_sha256_hash=0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1 +$(package)_patches=0001-Darwin-platform-allows-to-build-on-releases-before-Y.patch define $(package)_set_vars $(package)_config_env=AR="$($(package)_ar)" RANLIB="$($(package)_ranlib)" CC="$($(package)_cc)" @@ -93,7 +94,8 @@ endef define $(package)_preprocess_cmds sed -i.old 's/built on: $$$$date/built on: date not available/' util/mkbuildinf.pl && \ - sed -i.old "s|\"engines\", \"apps\", \"test\"|\"engines\"|" Configure + sed -i.old "s|\"engines\", \"apps\", \"test\"|\"engines\"|" Configure && \ + patch -p1 < $($(package)_patch_dir)/0001-Darwin-platform-allows-to-build-on-releases-before-Y.patch endef define $(package)_config_cmds diff --git a/depends/patches/openssl/0001-Darwin-platform-allows-to-build-on-releases-before-Y.patch b/depends/patches/openssl/0001-Darwin-platform-allows-to-build-on-releases-before-Y.patch new file mode 100644 index 0000000000..3fcee85a12 --- /dev/null +++ b/depends/patches/openssl/0001-Darwin-platform-allows-to-build-on-releases-before-Y.patch @@ -0,0 +1,63 @@ +From 96ac8f13f4d0ee96baf5724d9f96c44c34b8606c Mon Sep 17 00:00:00 2001 +From: David Carlier +Date: Tue, 24 Aug 2021 22:40:14 +0100 +Subject: [PATCH] Darwin platform allows to build on releases before + Yosemite/ios 8. + +issue #16407 #16408 + +Reviewed-by: Paul Dale +Reviewed-by: Tomas Mraz +(Merged from https://github.com/openssl/openssl/pull/16409) +--- + crypto/rand/rand_unix.c | 5 +---- + include/crypto/rand.h | 10 ++++++++++ + 2 files changed, 11 insertions(+), 4 deletions(-) + +diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c +index 43f1069d15..0f4525106a 100644 +--- a/crypto/rand/rand_unix.c ++++ b/crypto/rand/rand_unix.c +@@ -34,9 +34,6 @@ + #if defined(__OpenBSD__) + # include + #endif +-#if defined(__APPLE__) +-# include +-#endif + + #if defined(OPENSSL_SYS_UNIX) || defined(__DJGPP__) + # include +@@ -381,7 +378,7 @@ static ssize_t syscall_random(void *buf, size_t buflen) + if (errno != ENOSYS) + return -1; + } +-# elif defined(__APPLE__) ++# elif defined(OPENSSL_APPLE_CRYPTO_RANDOM) + if (CCRandomGenerateBytes(buf, buflen) == kCCSuccess) + return (ssize_t)buflen; + +diff --git a/include/crypto/rand.h b/include/crypto/rand.h +index 5350d3a931..674f840fd1 100644 +--- a/include/crypto/rand.h ++++ b/include/crypto/rand.h +@@ -20,6 +20,16 @@ + + # include + ++# if defined(__APPLE__) && !defined(OPENSSL_NO_APPLE_CRYPTO_RANDOM) ++# include ++# if (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || \ ++ (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) ++# define OPENSSL_APPLE_CRYPTO_RANDOM 1 ++# include ++# include ++# endif ++# endif ++ + /* forward declaration */ + typedef struct rand_pool_st RAND_POOL; + +-- +2.31.1 + From a419d4d16ae37e54dadef9c90903597422226ff4 Mon Sep 17 00:00:00 2001 From: cronicc Date: Tue, 5 Oct 2021 09:26:46 +0000 Subject: [PATCH 20/20] Update release notes script authors header --- doc/authors.md | 4 ++-- doc/release-notes/release-notes-2.0.24.md | 4 +++- zcutil/release-notes.py | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/doc/authors.md b/doc/authors.md index e5b58a6639..209f671456 100644 --- a/doc/authors.md +++ b/doc/authors.md @@ -1,11 +1,11 @@ -Zcash Contributors +Horizen Contributors ================== Jack Grigg (773) Simon Liu (338) FranckDG (219) Sean Bowe (204) -cronicc (155) +cronicc (157) Daira Hopwood (142) Wladimir J. van der Laan (122) Nathan Wilcox (106) diff --git a/doc/release-notes/release-notes-2.0.24.md b/doc/release-notes/release-notes-2.0.24.md index 38e116a617..ec88feab22 100644 --- a/doc/release-notes/release-notes-2.0.24.md +++ b/doc/release-notes/release-notes-2.0.24.md @@ -1,7 +1,7 @@ Changelog ========= -cronicc (19): +cronicc (21): Update about section in README.md Change user agent in help messages from 'MagicBean' to 'zen' Add websocket-client python test dependency @@ -21,6 +21,8 @@ cronicc (19): Update OpenSSL to 1.1.1l Set deprecation height 1047600/2021-12-1 Update manpages + Update changelog + Pull in patch fixing OpenSSL build error on older MacOS: https://github.com/openssl/openssl/commit/96ac8f13f4d0ee96baf5724d9f96c44c34b8606c luisantoniocrag (12): Fix RPC misc call help messages diff --git a/zcutil/release-notes.py b/zcutil/release-notes.py index 01f658f07d..3e980fbdde 100755 --- a/zcutil/release-notes.py +++ b/zcutil/release-notes.py @@ -67,7 +67,7 @@ def document_authors(): print "Writing contributors documented in release-notes directory to authors.md." authors_file = os.path.join(doc_dir, 'authors.md') with open(authors_file, 'w') as f: - f.write('Zcash Contributors\n==================\n\n') + f.write('Horizen Contributors\n==================\n\n') total_contrib = {} for notes in os.listdir(os.path.join(doc_dir, 'release-notes')): # Commits are duplicated across beta, RC and final release notes,