Merge pull request #4173 from clemahieu/flatbuffer_version_bump
Fixes the TSAN build by updating flat buffers to the recent version. Updating flatbuffer library to v23.3.3. C++20 compatibility with compiler version necessitated updating docker container to be Ubuntu 22.04 This commit is associated with the c++20 update https://github.com/nanocurrency/nano-node/pull/4017
This commit is contained in:
commit
75c6ef6f79
5 changed files with 9 additions and 9 deletions
|
|
@ -215,7 +215,7 @@ find_package(Threads)
|
|||
if(WIN32)
|
||||
find_library(PSAPI Psapi)
|
||||
add_definitions(-D_WIN32_WINNT=0x0600 -DWINVER=0x0600 -DMINIUPNP_STATICLIB
|
||||
-D_CRT_SECURE_NO_WARNINGS /EHsc)
|
||||
-D_CRT_SECURE_NO_WARNINGS -DNOGDI /EHsc)
|
||||
|
||||
if(${USING_TSAN}
|
||||
OR ${USING_ASAN}
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ if [[ "$OS" == 'Linux' ]]; then
|
|||
if [[ ${LCOV:-0} == 1 ]]; then
|
||||
cmake --build ${PWD} --target generate_coverage -- -j2
|
||||
else
|
||||
cmake --build ${PWD} --target ${build_target} -k -- -j2
|
||||
cmake --build ${PWD} --target ${build_target} -- -j2
|
||||
fi
|
||||
else
|
||||
sudo cmake --build ${PWD} --target ${build_target} -- -j2
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
FROM ubuntu:20.04
|
||||
FROM ubuntu:22.04
|
||||
|
||||
ENV DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
|
|
@ -6,13 +6,16 @@ RUN apt-get update -qq && apt-get install -yqq \
|
|||
build-essential \
|
||||
g++ \
|
||||
wget \
|
||||
python \
|
||||
python3 \
|
||||
zlib1g-dev \
|
||||
cmake \
|
||||
git
|
||||
|
||||
RUN apt-get update -qq && apt-get install -yqq \
|
||||
qt5-default \
|
||||
qtbase5-dev \
|
||||
qtchooser \
|
||||
qt5-qmake \
|
||||
qtbase5-dev-tools \
|
||||
valgrind \
|
||||
xorg xvfb xauth xfonts-100dpi xfonts-75dpi xfonts-scalable xfonts-cyrillic
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,5 @@
|
|||
ARG ENV_REPOSITORY=nanocurrency/nano-env
|
||||
FROM ${ENV_REPOSITORY}:base
|
||||
|
||||
RUN apt-get update -qq && apt-get install -yqq \
|
||||
..
|
||||
|
||||
ARG REPOSITORY=nanocurrency/nano-node
|
||||
LABEL org.opencontainers.image.source https://github.com/$REPOSITORY
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit a9a295fecf3fbd5a4f571f53b01f63202a3e2113
|
||||
Subproject commit 01834de25e4bf3975a9a00e816292b1ad0fe184b
|
||||
Loading…
Add table
Add a link
Reference in a new issue