update LD_LIBRARY_PATH for building (#2964)
* update LD_LIBRARY_PATH for building boost is in a non-standard location for our artifacts, this will allow nix artifacts to find libboost_context.* * unrelated change to entry.sh to handle test network in docker build
This commit is contained in:
parent
5c3ea1284f
commit
32b47ac824
4 changed files with 8 additions and 2 deletions
2
.github/workflows/beta_artifacts.yml
vendored
2
.github/workflows/beta_artifacts.yml
vendored
|
|
@ -44,7 +44,7 @@ jobs:
|
|||
- name: Fetch Deps
|
||||
run: ci/actions/linux/install_deps.sh
|
||||
- name: Build Artifact
|
||||
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}"
|
||||
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}"
|
||||
- name: Deploy Artifact
|
||||
run: ci/actions/deploy.sh
|
||||
env:
|
||||
|
|
|
|||
2
.github/workflows/live_artifacts.yml
vendored
2
.github/workflows/live_artifacts.yml
vendored
|
|
@ -43,7 +43,7 @@ jobs:
|
|||
- name: Fetch Deps
|
||||
run: ci/actions/linux/install_deps.sh
|
||||
- name: Build Artifact
|
||||
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}"
|
||||
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}"
|
||||
- name: Deploy Artifact
|
||||
run: ci/actions/deploy.sh
|
||||
env:
|
||||
|
|
|
|||
|
|
@ -5,6 +5,9 @@ ARG TRAVIS_TAG=DEV_BUILD
|
|||
ARG CI_BUILD=OFF
|
||||
ADD ./ /tmp/src
|
||||
|
||||
ARG LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/tmp/boost/lib
|
||||
RUN ldconfig
|
||||
|
||||
RUN mkdir /tmp/build && \
|
||||
cd /tmp/build && \
|
||||
cmake /tmp/src -DCI_BUILD=${CI_BUILD} \
|
||||
|
|
|
|||
|
|
@ -84,6 +84,9 @@ case "${network}" in
|
|||
dev)
|
||||
dirSuffix='Dev'
|
||||
;;
|
||||
test)
|
||||
dirSuffix='Test'
|
||||
;;
|
||||
esac
|
||||
|
||||
raidir="${HOME}/RaiBlocks${dirSuffix}"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue