From 7152ae951941eabbc6d8144df547646de8ce887c Mon Sep 17 00:00:00 2001 From: jouzo Date: Mon, 30 May 2022 14:58:57 +0100 Subject: [PATCH] Add --disable-bench flag to Dev build --- .github/workflows/dev-builds.yaml | 6 +++++- contrib/dockerfiles/x86_64-apple-darwin18.dockerfile | 2 +- contrib/dockerfiles/x86_64-pc-linux-gnu.dockerfile | 2 +- contrib/dockerfiles/x86_64-w64-mingw32.dockerfile | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dev-builds.yaml b/.github/workflows/dev-builds.yaml index 09aeefd730e..3f7e801ffbb 100644 --- a/.github/workflows/dev-builds.yaml +++ b/.github/workflows/dev-builds.yaml @@ -20,6 +20,10 @@ on: - e/* - v* - "[0-9]+.[0-9]+.x" + +env: + MAKE_CONF_ARGS: --disable-bench + jobs: linux: @@ -43,7 +47,7 @@ jobs: with: name: defichain-${{ env.BUILD_VERSION }}-x86_64-pc-linux-gnu path: ./build/defichain-${{ env.BUILD_VERSION }}-x86_64-pc-linux-gnu.tar.gz - + # Linux build additionally pushes the docker images to docker hub on successful build - name: Tag dockerhub build if: ${{ github.repository == 'DeFiCh/ain' }} diff --git a/contrib/dockerfiles/x86_64-apple-darwin18.dockerfile b/contrib/dockerfiles/x86_64-apple-darwin18.dockerfile index 850e63b9d18..7eddef97759 100644 --- a/contrib/dockerfiles/x86_64-apple-darwin18.dockerfile +++ b/contrib/dockerfiles/x86_64-apple-darwin18.dockerfile @@ -46,7 +46,7 @@ COPY . . RUN ./autogen.sh # XREF: #make-configure -RUN ./configure --prefix=`pwd`/depends/${TARGET} +RUN ./configure --prefix=`pwd`/depends/${TARGET} ${MAKE_CONF_ARGS} ARG BUILD_VERSION= diff --git a/contrib/dockerfiles/x86_64-pc-linux-gnu.dockerfile b/contrib/dockerfiles/x86_64-pc-linux-gnu.dockerfile index d5ac4475e97..10ab86b03c4 100644 --- a/contrib/dockerfiles/x86_64-pc-linux-gnu.dockerfile +++ b/contrib/dockerfiles/x86_64-pc-linux-gnu.dockerfile @@ -52,7 +52,7 @@ COPY . . RUN ./autogen.sh # XREF: #make-configure -RUN ./configure CC=clang-11 CXX=clang++-11 --prefix=`pwd`/depends/${TARGET} +RUN ./configure CC=clang-11 CXX=clang++-11 --prefix=`pwd`/depends/${TARGET} ${MAKE_CONF_ARGS} ARG BUILD_VERSION= diff --git a/contrib/dockerfiles/x86_64-w64-mingw32.dockerfile b/contrib/dockerfiles/x86_64-w64-mingw32.dockerfile index 6133c4ebaed..165a74e3cb5 100644 --- a/contrib/dockerfiles/x86_64-w64-mingw32.dockerfile +++ b/contrib/dockerfiles/x86_64-w64-mingw32.dockerfile @@ -49,7 +49,7 @@ COPY . . RUN ./autogen.sh # XREF: #make-configure -RUN CONFIG_SITE=`pwd`/depends/x86_64-w64-mingw32/share/config.site ./configure --prefix=/ +RUN CONFIG_SITE=`pwd`/depends/x86_64-w64-mingw32/share/config.site ./configure --prefix=/ ${MAKE_CONF_ARGS} ARG BUILD_VERSION=