Skip to content

Commit 4b816a5

Browse files
authored
Update cppcheck to v2.10.2 (#2999)
Create and push docker image concordbft/concord-bft:0.61 also tagged as concordbft/concord-bft:latest
1 parent 613ab23 commit 4b816a5

File tree

5 files changed

+13
-14
lines changed

5 files changed

+13
-14
lines changed

.github/workflows/build_and_test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
name: Build
1111
runs-on: ubuntu-22.04
1212
container:
13-
image: concordbft/concord-bft:0.60
13+
image: concordbft/concord-bft:latest
1414
options: --cap-add=NET_ADMIN
1515
strategy:
1616
fail-fast: false

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# For example wget and pip-tools.
88

99
ARG CONCORD_BFT_TOOLCHAIN_IMAGE_REPO="concordbft/concord-bft"
10-
ARG CONCORD_BFT_TOOLCHAIN_IMAGE_TAG="toolchain-0.01"
10+
ARG CONCORD_BFT_TOOLCHAIN_IMAGE_TAG="toolchain-0.02"
1111
FROM ${CONCORD_BFT_TOOLCHAIN_IMAGE_REPO}:${CONCORD_BFT_TOOLCHAIN_IMAGE_TAG}
1212

1313
ARG GIT_COMMIT

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ CONCORD_BFT_DOCKER_REPO?=concordbft/
22

33
# Base Toolchain image
44
CONCORD_BFT_DOCKER_IMAGE_TOOLCHAIN?=concord-bft
5-
CONCORD_BFT_DOCKER_IMAGE_TOOLCHAIN_VERSION?=toolchain-0.01
5+
CONCORD_BFT_DOCKER_IMAGE_TOOLCHAIN_VERSION?=toolchain-0.02
66
CONCORD_BFT_DOCKERFILE_TOOLCHAIN?=DockerfileToolchain
77
# Release (production) image
88
CONCORD_BFT_DOCKER_IMAGE_RELEASE?=concord-bft
9-
CONCORD_BFT_DOCKER_IMAGE_VERSION_RELEASE?=0.60
9+
CONCORD_BFT_DOCKER_IMAGE_VERSION_RELEASE?=latest
1010
CONCORD_BFT_DOCKERFILE_RELEASE?=Dockerfile
1111

1212
# Debug (development) image

install_deps_release.sh

+2
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@ install_googletest() {
8787
cmake -DCMAKE_CXX_FLAGS="-std=c++11 -march=x86-64 -mtune=generic" ..
8888
make -j$(nproc) install
8989
cd ${HOME} && rm -r googletest
90+
}
91+
9092
install_rocksdb_lib() {
9193
cd ${HOME}
9294
wget ${WGET_FLAGS} \

install_toolchain.sh

+7-10
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,13 @@ install_cmake() {
5252
}
5353

5454
install_cppcheck(){
55-
cd ${HOME}
56-
CPPCHECK_VER="2.8"
57-
wget ${WGET_FLAGS} https://sourceforge.net/projects/cppcheck/files/cppcheck/${CPPCHECK_VER}/cppcheck-${CPPCHECK_VER}.tar.gz/download -O ./cppcheck.tar.gz
58-
tar -xvzf cppcheck.tar.gz && rm ./cppcheck.tar.gz
59-
cd cppcheck-${CPPCHECK_VER}
60-
mkdir build && cd build
61-
cmake ..
62-
cmake --build .
63-
make -j$(nproc) install
64-
cd ${HOME} && rm -rf cppcheck-${CPPCHECK_VER}
55+
cd ${HOME}
56+
git clone -b 2.10.2 https://github.com/danmar/cppcheck.git
57+
cd cppcheck && mkdir build && cd build
58+
cmake ..
59+
make -j$(proc)
60+
make install
61+
cd ${HOME} && rm -rf cppcheck
6562
}
6663

6764
install_ccache(){

0 commit comments

Comments
 (0)