diff --git a/.github/workflows/release_test.yml b/.github/workflows/release_test.yml index 772b5947..ad552dcd 100644 --- a/.github/workflows/release_test.yml +++ b/.github/workflows/release_test.yml @@ -32,7 +32,7 @@ jobs: - name: Fetch Deps run: ci/actions/linux/install_deps.sh - name: Run Tests - run: docker run -v ${PWD}:/workspace nanocurrency/nano-env:gcc /bin/bash -c "cd /workspace && RELEASE=1 ./ci/build-travis.sh /usr/lib/x86_64-linux-gnu/cmake/Qt5 ${PWD}" + run: docker run -v ${PWD}:/workspace nanocurrency/nano-env:gcc /bin/bash -c "cd /workspace && export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/tmp/boost/lib && ldconfig && RELEASE=1 ./ci/build-travis.sh /usr/lib/x86_64-linux-gnu/cmake/Qt5 ${PWD}" clang_test: runs-on: ubuntu-18.04 @@ -44,7 +44,7 @@ jobs: - name: Fetch Deps run: ci/actions/linux/install_deps.sh - name: Run Tests - run: docker run -v ${PWD}:/workspace nanocurrency/nano-env:clang-6 /bin/bash -c "cd /workspace && RELEASE=1 ./ci/build-travis.sh /usr/lib/x86_64-linux-gnu/cmake/Qt5 ${PWD}" + run: docker run -v ${PWD}:/workspace nanocurrency/nano-env:clang-6 /bin/bash -c "cd /workspace && export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/tmp/boost/lib && ldconfig && RELEASE=1 ./ci/build-travis.sh /usr/lib/x86_64-linux-gnu/cmake/Qt5 ${PWD}" windows_test: runs-on: windows-latest diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e1b0a1af..14f4dfef 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -30,7 +30,7 @@ jobs: - name: Fetch Deps run: ci/actions/linux/install_deps.sh - name: Run Tests - run: docker run -v ${PWD}:/workspace nanocurrency/nano-env:gcc /bin/bash -c "cd /workspace && ./ci/build-travis.sh /usr/lib/x86_64-linux-gnu/cmake/Qt5 ${PWD}" + run: docker run -v ${PWD}:/workspace nanocurrency/nano-env:gcc /bin/bash -c "cd /workspace && export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/tmp/boost/lib && ldconfig && ./ci/build-travis.sh /usr/lib/x86_64-linux-gnu/cmake/Qt5 ${PWD}" clang_test: runs-on: ubuntu-18.04 @@ -42,7 +42,7 @@ jobs: - name: Fetch Deps run: ci/actions/linux/install_deps.sh - name: Run Tests - run: docker run -v ${PWD}:/workspace nanocurrency/nano-env:clang-6 /bin/bash -c "cd /workspace && ./ci/build-travis.sh /usr/lib/x86_64-linux-gnu/cmake/Qt5 ${PWD}" + run: docker run -v ${PWD}:/workspace nanocurrency/nano-env:clang-6 /bin/bash -c "cd /workspace && export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/tmp/boost/lib && ldconfig && ./ci/build-travis.sh /usr/lib/x86_64-linux-gnu/cmake/Qt5 ${PWD}" windows_test: runs-on: windows-latest diff --git a/docker/ci/Dockerfile-base b/docker/ci/Dockerfile-base index 61cb8e7d..3bcd7bf2 100644 --- a/docker/ci/Dockerfile-base +++ b/docker/ci/Dockerfile-base @@ -1,4 +1,4 @@ -FROM ubuntu:16.04 +FROM ubuntu:18.04 ENV DEBIAN_FRONTEND=noninteractive @@ -6,7 +6,8 @@ RUN apt-get update -qq && apt-get install -yqq \ build-essential \ g++ \ wget \ - python + python \ + zlib1g-dev RUN wget -O cmake_install.sh https://github.com/Kitware/CMake/releases/download/v3.15.4/cmake-3.15.4-Linux-x86_64.sh && \ chmod +x cmake_install.sh && \ diff --git a/docker/node/Dockerfile b/docker/node/Dockerfile index 7ecdf418..1d070be5 100644 --- a/docker/node/Dockerfile +++ b/docker/node/Dockerfile @@ -16,7 +16,7 @@ RUN mkdir /tmp/build && \ cd .. && \ echo ${NETWORK} > /etc/nano-network -FROM ubuntu:16.04 +FROM ubuntu:18.04 RUN groupadd --gid 1000 nanocurrency && \ useradd --uid 1000 --gid nanocurrency --shell /bin/bash --create-home nanocurrency diff --git a/util/build_prep/fetch_boost.sh b/util/build_prep/fetch_boost.sh index 86631437..2b938f33 100755 --- a/util/build_prep/fetch_boost.sh +++ b/util/build_prep/fetch_boost.sh @@ -4,7 +4,11 @@ OS=`uname` COMPILER="${COMPILER:-clang}" pushd /tmp -wget -O boost-$OS-$COMPILER.tgz https://s3.us-east-2.amazonaws.com/repo.nano.org/artifacts/boost-$OS-$COMPILER-1.70-full.tgz +if [[ "$OS" == 'Linux' ]]; then + wget -O boost-$OS-$COMPILER.tgz https://s3.us-east-2.amazonaws.com/repo.nano.org/artifacts/boost-$OS-$COMPILER-1.70-full-18.tgz +else + wget -O boost-$OS-$COMPILER.tgz https://s3.us-east-2.amazonaws.com/repo.nano.org/artifacts/boost-$OS-$COMPILER-1.70-full.tgz +fi tar -zxf boost-$OS-$COMPILER.tgz mv tmp/* . rm -fr tmp diff --git a/util/build_prep/fetch_rocksdb.sh b/util/build_prep/fetch_rocksdb.sh index 61d14d43..b3062ccf 100755 --- a/util/build_prep/fetch_rocksdb.sh +++ b/util/build_prep/fetch_rocksdb.sh @@ -1,11 +1,6 @@ #!/usr/bin/env bash OS=`uname` - -if [[ $OS =~ "Darwin" ]]; then - artifact="rocksdb-clang-latest.tgz" -else - artifact="rocksdb-gcc-latest.tgz" -fi +artifact="rocksdb-Linux-6.3.6-18.tgz" pushd /tmp wget -O $artifact https://s3.us-east-2.amazonaws.com/repo.nano.org/artifacts/$artifact