Merge pull request #887 from lukaszstolarczuk/merge-stable-1.8-into-stable-1.9

Szymon Romik · web-flow · commit 27485374542b · 2020-09-24T09:12:30.000+02:00
Merge stable-1.8 into stable-1.9
diff --git a/.github/workflows/gha.yml b/.github/workflows/gha.yml
@@ -26,16 +26,16 @@ jobs:
       WORKDIR:        utils/docker
     strategy:
       matrix:
-        CONFIG: ["N=1 OS=ubuntu OS_VER=19.10 TYPE=debug PUSH_IMAGE=1",
-                 "N=2 OS=fedora OS_VER=31    TYPE=debug PUSH_IMAGE=1",
-                 "N=3 OS=ubuntu OS_VER=19.10 TYPE=release",
-                 "N=4 OS=fedora OS_VER=31    TYPE=release XXX_DISABLE_AUTO_DOC_UPDATE=1",
-                 "N=5 OS=ubuntu OS_VER=19.10 TYPE=valgrind",
-                 "N=6 OS=ubuntu OS_VER=19.10 TYPE=memcheck_drd",
-                 "N=7 OS=ubuntu OS_VER=19.10 TYPE=package",
-                 "N=8 OS=fedora OS_VER=31    TYPE=package",
-                 "N=9 OS=ubuntu OS_VER=19.10 TYPE=coverage",
-                "N=10 OS=ubuntu OS_VER=19.10 TYPE=coverity"]
+        CONFIG: ["TYPE=debug OS=fedora OS_VER=32 PUSH_IMAGE=1",
+                 "TYPE=debug OS=ubuntu OS_VER=20.04 PUSH_IMAGE=1 CHECK_CPP_STYLE=1",
+                 "TYPE=release OS=fedora OS_VER=32 XXX_DISABLE_AUTO_DOC_UPDATE=1",
+                 "TYPE=release OS=ubuntu OS_VER=20.04",
+                 "TYPE=valgrind OS=ubuntu OS_VER=20.04",
+                 "TYPE=memcheck_drd OS=ubuntu OS_VER=20.04",
+                 "TYPE=package OS=fedora OS_VER=32",
+                 "TYPE=package OS=ubuntu OS_VER=20.04",
+                 "TYPE=coverage OS=ubuntu OS_VER=20.04",
+                 "TYPE=coverity OS=ubuntu OS_VER=20.04"]
     steps:
        - name: Clone the git repo
          uses: actions/checkout@v2
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -215,15 +215,15 @@ add_dependencies(check-whitespace check-whitespace-main)
 add_custom_target(tests)
 
 if(CHECK_CPP_STYLE)
-	find_program(CLANG_FORMAT NAMES clang-format clang-format-9.0)
+	find_program(CLANG_FORMAT NAMES clang-format clang-format-9 clang-format-9.0)
 	set(CLANG_FORMAT_REQUIRED "9.0")
 	if(CLANG_FORMAT)
 		get_program_version_major_minor(${CLANG_FORMAT} CLANG_FORMAT_VERSION)
 		if(NOT (CLANG_FORMAT_VERSION VERSION_EQUAL CLANG_FORMAT_REQUIRED))
 			message(FATAL_ERROR "required clang-format version is ${CLANG_FORMAT_REQUIRED} (found version: ${CLANG_FORMAT_VERSION})")
 		endif()
 	else()
-		message(WARNING "clang-format not found - C++ sources will not be checked (required version: ${CLANG_FORMAT_REQUIRED})")
+		message(FATAL_ERROR "CHECK_CPP_STYLE=ON, but clang-format not found (required version: ${CLANG_FORMAT_REQUIRED})")
 	endif()
 endif()
 
diff --git a/doc/libpmemobj++.Doxyfile.in b/doc/libpmemobj++.Doxyfile.in
@@ -73,7 +73,12 @@ HIDE_UNDOC_CLASSES = YES
 # standard output by doxygen. If QUIET is set to YES this implies that the
 # messages are off.
 
-QUIET = YES
+QUIET = NO
+
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
+# in which the alphabetical index list will be split.
+
+COLS_IN_ALPHA_INDEX = 1
 
 #---------------------------------------------------------------------------
 # Configuration options related to the input files
diff --git a/travis.yml b/travis.yml
@@ -12,16 +12,16 @@ env:
     - GITHUB_REPO=pmem/libpmemobj-cpp
     - DOCKERHUB_REPO=pmem/libpmemobj-cpp
   matrix:
-    - OS=ubuntu OS_VER=19.10 TYPE=debug PUSH_IMAGE=1
-    - OS=fedora OS_VER=31    TYPE=debug PUSH_IMAGE=1
-    - OS=ubuntu OS_VER=19.10 TYPE=release
-    - OS=fedora OS_VER=31    TYPE=release AUTO_DOC_UPDATE=1
-    - OS=ubuntu OS_VER=19.10 TYPE=valgrind
-    - OS=ubuntu OS_VER=19.10 TYPE=memcheck_drd
-    - OS=ubuntu OS_VER=19.10 TYPE=package
-    - OS=fedora OS_VER=31    TYPE=package
-    - OS=ubuntu OS_VER=19.10 TYPE=coverage
-    - OS=ubuntu OS_VER=19.10 TYPE=coverity
+    - TYPE=debug OS=fedora OS_VER=32 PUSH_IMAGE=1
+    - TYPE=debug OS=ubuntu OS_VER=20.04 PUSH_IMAGE=1 CHECK_CPP_STYLE=1
+    - TYPE=release OS=fedora OS_VER=32 AUTO_DOC_UPDATE=1
+    - TYPE=release OS=ubuntu OS_VER=20.04
+    - TYPE=valgrind OS=ubuntu OS_VER=20.04
+    - TYPE=memcheck_drd OS=ubuntu OS_VER=20.04
+    - TYPE=package OS=fedora OS_VER=32
+    - TYPE=package OS=ubuntu OS_VER=20.04
+    - TYPE=coverage OS=ubuntu OS_VER=20.04
+    - TYPE=coverity OS=ubuntu OS_VER=20.04
 
 before_install:
   - echo $TRAVIS_COMMIT_RANGE
diff --git a/utils/docker/build.sh b/utils/docker/build.sh
@@ -156,7 +156,7 @@ docker run --privileged=true --name=$containerName -i $TTY \
 	--env GITHUB_TOKEN=$GITHUB_TOKEN \
 	--env COVERITY_SCAN_TOKEN=$COVERITY_SCAN_TOKEN \
 	--env COVERITY_SCAN_NOTIFICATION_EMAIL=$COVERITY_SCAN_NOTIFICATION_EMAIL \
-	--env CHECK_CPP_STYLE=${CHECK_CPP_STYLE:-ON} \
+	--env CHECK_CPP_STYLE=${CHECK_CPP_STYLE:-OFF} \
 	--env TESTS_LONG=${TESTS_LONG:-OFF} \
 	--env TESTS_TBB=${TESTS_TBB:-ON} \
 	--env TZ='Europe/Warsaw' \
diff --git a/utils/docker/images/Dockerfile.fedora-32 b/utils/docker/images/Dockerfile.fedora-32
@@ -35,12 +35,12 @@
 #
 
 # Pull base image
-FROM fedora:31
+FROM fedora:32
 MAINTAINER szymon.romik@intel.com
 
 # Set required environment variables
 ENV OS fedora
-ENV OS_VER 31
+ENV OS_VER 32
 ENV PACKAGE_MANAGER rpm
 ENV NOTTY 1
 
@@ -60,6 +60,7 @@ RUN dnf update -y \
 	daxctl-devel \
 	doxygen \
 	gcc \
+	gcc-c++ \
 	gdb \
 	git \
 	hub \
@@ -75,6 +76,7 @@ RUN dnf update -y \
 	ndctl-devel \
 	open-sans-fonts \
 	pandoc \
+	passwd \
 	perl-Text-Diff \
 	rpm-build \
 	rpm-build-libs \
diff --git a/utils/docker/images/Dockerfile.ubuntu-20.04 b/utils/docker/images/Dockerfile.ubuntu-20.04
@@ -35,12 +35,12 @@
 #
 
 # Pull base image
-FROM ubuntu:19.10
+FROM ubuntu:20.04
 MAINTAINER szymon.romik@intel.com
 
 # Set required environment variables
 ENV OS ubuntu
-ENV OS_VER 19.10
+ENV OS_VER 20.04
 ENV PACKAGE_MANAGER deb
 ENV NOTTY 1
 
@@ -56,7 +56,7 @@ RUN apt-get update \
 	asciidoc \
 	autoconf \
 	clang \
-	clang-format \
+	clang-format-9 \
 	cmake \
 	curl \
 	debhelper \
diff --git a/utils/docker/images/build-image.sh b/utils/docker/images/build-image.sh
@@ -41,32 +41,36 @@
 
 set -e
 
-OS_VER=$1
-
 function usage {
+	echo
 	echo "Usage:"
 	echo "    build-image.sh <OS-VER>"
 	echo "where <OS-VER>, for example, can be 'fedora-31', provided " \
 		"a Dockerfile named 'Dockerfile.fedora-31' exists in the " \
 		"current directory."
 }
+OS__OS_VER=${1}
 
-# Check if the argument is not empty
-if [[ -z "$1" ]]; then
+echo "Check if the argument is not empty"
+if [[ -z "${OS__OS_VER}" ]]; then
 	usage
 	exit 1
 fi
 
-# Check if the file Dockerfile.OS-VER exists
-if [[ ! -f "Dockerfile.$OS_VER" ]]; then
-	echo "Error: Dockerfile.$OS_VER does not exist."
-	echo
+if [[ -z "${DOCKERHUB_REPO}" ]]; then
+	echo "DOCKERHUB_REPO environment variable is not set"
+	exit 1
+fi
+
+echo "Check if the file Dockerfile.${OS__OS_VER} exists"
+if [[ ! -f "Dockerfile.${OS__OS_VER}" ]]; then
+	echo "Error: Dockerfile.${OS__OS_VER} does not exist."
 	usage
 	exit 1
 fi
 
-# Build a Docker image tagged with ${DOCKERHUB_REPO}:1.9-OS-VER
-docker build -t ${DOCKERHUB_REPO}:1.9-${OS_VER} \
+echo "Build a Docker image tagged with ${DOCKERHUB_REPO}:1.9-${OS__OS_VER}"
+docker build -t ${DOCKERHUB_REPO}:1.9-${OS__OS_VER} \
 	--build-arg http_proxy=$http_proxy \
 	--build-arg https_proxy=$https_proxy \
-	-f Dockerfile.${OS_VER} .
+	-f Dockerfile.${OS__OS_VER} .
diff --git a/utils/docker/images/install-pmdk.sh b/utils/docker/images/install-pmdk.sh
@@ -38,8 +38,8 @@ set -e
 
 PACKAGE_MANAGER=$1
 
-# tag: 1.8, 31.01.2020
-PMDK_VERSION="1.8"
+# tag: 1.8.1, 16.09.2020
+PMDK_VERSION="1.8.1"
 
 if [ "${SKIP_PMDK_BUILD}" ]; then
 	echo "Variable 'SKIP_PMDK_BUILD' is set; skipping building PMDK"
diff --git a/utils/docker/images/install-valgrind.sh b/utils/docker/images/install-valgrind.sh
@@ -43,11 +43,12 @@ fi
 
 git clone --recursive https://github.com/pmem/valgrind.git
 cd valgrind
-# pmem-3.15: Merge pull request #73 from kkajrewicz/fix-memcheck
-git checkout c27a8a2f973414934e63f1e94bc84c0a580e3840
+# pmem-3.15: Merge pull request #81 from marcinslusarz/pmem-3.15
+git checkout 09f75f69683d862f8456f75484fcdc0dc5508900
+
 ./autogen.sh
 ./configure --prefix=/usr
 make -j$(nproc)
-make -j$(nproc) install
+sudo make -j$(nproc) install
 cd ..
 rm -rf valgrind
diff --git a/utils/docker/images/push-image.sh b/utils/docker/images/push-image.sh
@@ -40,12 +40,12 @@
 
 set -e
 
-if [[ -z "$OS" ]]; then
+if [[ -z "${OS}" ]]; then
 	echo "OS environment variable is not set"
 	exit 1
 fi
 
-if [[ -z "$OS_VER" ]]; then
+if [[ -z "${OS_VER}" ]]; then
 	echo "OS_VER environment variable is not set"
 	exit 1
 fi
@@ -57,16 +57,16 @@ fi
 
 TAG="1.9-${OS}-${OS_VER}"
 
-# Check if the image tagged with ${DOCKERHUB_REPO}:1.9-OS-VER exists locally
+echo " Check if the image tagged with ${DOCKERHUB_REPO}:${TAG} exists locally"
 if [[ ! $(docker images -a | awk -v pattern="^${DOCKERHUB_REPO}:${TAG}\$" \
 	'$1":"$2 ~ pattern') ]]
 then
-	echo "ERROR: Docker image tagged ${DOCKERHUB_REPO}:${TAG} does not exists locally."
+	echo "ERROR: Docker image tagged ${DOCKERHUB_REPO}:${TAG} does not exist locally."
 	exit 1
 fi
 
-# Log in to the Docker Hub
-docker login -u="$DOCKERHUB_USER" -p="$DOCKERHUB_PASSWORD"
+echo "Log in to the Docker Hub"
+docker login -u="${DOCKERHUB_USER}" -p="${DOCKERHUB_PASSWORD}"
 
-# Push the image to the repository
+echo "Push the image to the repository"
 docker push ${DOCKERHUB_REPO}:${TAG}
