dn724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

build bootstrap artifacts to be compatible with rpath linking (#2988)

Browse source 
* build bootstrap artifacts to be compatible with rpath linking
since we use a custom prefix we need to use hardcoded paths linking to
$ORIGIN/../lib like our rpath for nix,
removed all LD_LIBRARY_PATH updates as they are no longer needed for
dependent boost libs

* invalidate docker cache at fetch_boost.sh
forcing rebuild with correct boost cache
This commit is contained in:
Russel Waters 2020-09-28 14:08:33 -07:00 • committed by GitHub
commit c9ddc53f41
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/beta_artifacts.yml vendored
View file

@ -44,7 +44,7 @@ jobs:
- name: Fetch Deps - name: Fetch Deps
run: ci/actions/linux/install_deps.sh run: ci/actions/linux/install_deps.sh
- name: Build Artifact - name: Build Artifact
run: docker run -v ${GITHUB_WORKSPACE}:/workspace nanocurrency/nano-env:gcc /bin/bash -c "cd /workspace && export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/tmp/boost/lib && ldconfig && BETA=1 TRAVIS_TAG=${TAG} ci/build-deploy.sh /usr/lib/x86_64-linux-gnu/cmake/Qt5 ${PWD}" run: docker run -v ${GITHUB_WORKSPACE}:/workspace nanocurrency/nano-env:gcc /bin/bash -c "cd /workspace && BETA=1 TRAVIS_TAG=${TAG} ci/build-deploy.sh /usr/lib/x86_64-linux-gnu/cmake/Qt5 ${PWD}"
- name: Deploy Artifact - name: Deploy Artifact
run: ci/actions/deploy.sh run: ci/actions/deploy.sh
env: env:

2
.github/workflows/live_artifacts.yml vendored
View file

@ -43,7 +43,7 @@ jobs:
- name: Fetch Deps - name: Fetch Deps
run: ci/actions/linux/install_deps.sh run: ci/actions/linux/install_deps.sh
- name: Build Artifact - name: Build Artifact
run: docker run -v ${GITHUB_WORKSPACE}:/workspace nanocurrency/nano-env:gcc /bin/bash -c "cd /workspace && export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/tmp/boost/lib && ldconfig && TRAVIS_TAG=${TAG} ci/build-deploy.sh /usr/lib/x86_64-linux-gnu/cmake/Qt5 ${PWD}" run: docker run -v ${GITHUB_WORKSPACE}:/workspace nanocurrency/nano-env:gcc /bin/bash -c "cd /workspace && TRAVIS_TAG=${TAG} ci/build-deploy.sh /usr/lib/x86_64-linux-gnu/cmake/Qt5 ${PWD}"
- name: Deploy Artifact - name: Deploy Artifact
run: ci/actions/deploy.sh run: ci/actions/deploy.sh
env: env:

4
.github/workflows/release_tests.yml vendored
View file

@ -32,7 +32,7 @@ jobs:
- name: Fetch Deps - name: Fetch Deps
run: ci/actions/linux/install_deps.sh run: ci/actions/linux/install_deps.sh
- name: Run Tests - name: Run Tests
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}" 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}"
clang_test: clang_test:
runs-on: ubuntu-18.04 runs-on: ubuntu-18.04
@ -44,7 +44,7 @@ jobs:
- name: Fetch Deps - name: Fetch Deps
run: ci/actions/linux/install_deps.sh run: ci/actions/linux/install_deps.sh
- name: Run Tests - name: Run Tests
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}" 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}"
windows_test: windows_test:
runs-on: windows-latest runs-on: windows-latest

4
.github/workflows/rocksdb_release_tests.yml vendored
View file

@ -33,7 +33,7 @@ jobs:
- name: Fetch Deps - name: Fetch Deps
run: ci/actions/linux/install_deps.sh run: ci/actions/linux/install_deps.sh
- name: Run Tests - name: Run Tests
run: docker run -e TEST_USE_ROCKSDB -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}" run: docker run -e TEST_USE_ROCKSDB -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}"
clang_test: clang_test:
runs-on: ubuntu-18.04 runs-on: ubuntu-18.04
@ -45,4 +45,4 @@ jobs:
- name: Fetch Deps - name: Fetch Deps
run: ci/actions/linux/install_deps.sh run: ci/actions/linux/install_deps.sh
- name: Run Tests - name: Run Tests
run: docker run -e TEST_USE_ROCKSDB -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}" run: docker run -e TEST_USE_ROCKSDB -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}"

4
.github/workflows/rocksdb_tests.yml vendored
View file

@ -34,7 +34,7 @@ jobs:
- name: Fetch Deps - name: Fetch Deps
run: ci/actions/linux/install_deps.sh run: ci/actions/linux/install_deps.sh
- name: Run Tests - name: Run Tests
run: docker run -e TEST_USE_ROCKSDB -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}" run: docker run -e TEST_USE_ROCKSDB -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}"
clang_test: clang_test:
runs-on: ubuntu-18.04 runs-on: ubuntu-18.04
@ -47,7 +47,7 @@ jobs:
- name: Fetch Deps - name: Fetch Deps
run: ci/actions/linux/install_deps.sh run: ci/actions/linux/install_deps.sh
- name: Run Tests - name: Run Tests
run: docker run -e TEST_USE_ROCKSDB -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}" run: docker run -e TEST_USE_ROCKSDB -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}"
windows_test: windows_test:
runs-on: windows-latest runs-on: windows-latest

4
.github/workflows/tests.yml vendored
View file

@ -32,7 +32,7 @@ jobs:
- name: Fetch Deps - name: Fetch Deps
run: ci/actions/linux/install_deps.sh run: ci/actions/linux/install_deps.sh
- name: Run Tests - name: Run Tests
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}" 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}"
clang_test: clang_test:
runs-on: ubuntu-18.04 runs-on: ubuntu-18.04
@ -45,7 +45,7 @@ jobs:
- name: Fetch Deps - name: Fetch Deps
run: ci/actions/linux/install_deps.sh run: ci/actions/linux/install_deps.sh
- name: Run Tests - name: Run Tests
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}" 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}"
windows_test: windows_test:
runs-on: windows-latest runs-on: windows-latest

3
docker/node/Dockerfile
View file

@ -5,9 +5,6 @@ ARG TRAVIS_TAG=DEV_BUILD
ARG CI_BUILD=OFF ARG CI_BUILD=OFF
ADD ./ /tmp/src ADD ./ /tmp/src
ARG LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/tmp/boost/lib
RUN ldconfig
RUN mkdir /tmp/build && \ RUN mkdir /tmp/build && \
cd /tmp/build && \ cd /tmp/build && \
cmake /tmp/src -DCI_BUILD=${CI_BUILD} \ cmake /tmp/src -DCI_BUILD=${CI_BUILD} \

2
util/build_prep/bootstrap_boost.sh
View file

@ -141,7 +141,7 @@ tar xf "${BOOST_ARCHIVE}"
pushd "${BOOST_BASENAME}" pushd "${BOOST_BASENAME}"
./bootstrap.sh "${bootstrapArgs[@]}" ./bootstrap.sh "${bootstrapArgs[@]}"
./b2 -d${debugLevel} -j${buildThreads} --prefix="${BOOST_ROOT}" ${LINK_TYPE[@]} "${buildArgs[@]}" install ./b2 -d${debugLevel} -j${buildThreads} hardcode-dll-paths=true dll-path="'\$ORIGIN/../lib'" --prefix="${BOOST_ROOT}" ${LINK_TYPE[@]} "${buildArgs[@]}" install
popd popd
rm -rf "${BOOST_BASENAME}" rm -rf "${BOOST_BASENAME}"

2
util/build_prep/fetch_boost.sh
View file

@ -5,7 +5,7 @@ COMPILER="${COMPILER:-clang}"
pushd /tmp pushd /tmp
if [[ "$OS" == 'Linux' ]]; then 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 wget -O boost-$OS-$COMPILER.tgz https://s3.us-east-2.amazonaws.com/repo.nano.org/artifacts/boost-$OS-$COMPILER-1.70-18.tgz
else 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 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 fi