Merge pull request #1269 from lukaszstolarczuk/merge-stable-1.7-into-stable-1.8

Merge stable-1.7 into stable-1.8

Author: igchor

CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright 2018-2021, Intel Corporation
+# Copyright 2018-2022, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

ChangeLog

@@ -1,3 +1,16 @@
+Fri Jul 29 2022 Łukasz Stolarczuk <[email protected]>
+
+	* Version 1.7.1
+
+	This release fixes minor bugs.
+
+	This is the last patch release for libpmemobj-cpp 1.7 version.
+	Maintenance of this version is no longer supported.
+
+	Notable changes:
+	- Properly install pkg-config file for all configurations
+	- Fix void_t declaration and API usage for concurrent hashmap test
+
 Tue Jul 06 2021 Łukasz Stolarczuk <[email protected]>
 
 	* Version 1.6.1

appveyor.yml

@@ -14,7 +14,6 @@ install:
     Out-File -Encoding UTF8 c:/tools/vcpkg/ports/pmdk/portfile2.cmake;
     Copy-Item -Path c:/tools/vcpkg/ports/pmdk/portfile2.cmake -Destination c:/tools/vcpkg/ports/pmdk/portfile.cmake;
 - vcpkg install pmdk:x64-windows
-- vcpkg install sfml:x64-windows
 - vcpkg integrate install
 
 cache: c:\tools\vcpkg\installed

travis.yml

@@ -9,7 +9,7 @@ services:
 
 env:
   matrix:
-    - TYPE=debug OS=fedora OS_VER=32 PUSH_IMAGE=1 AUTO_DOC_UPDATE=1
+    - TYPE=debug OS=fedora OS_VER=32 PUSH_IMAGE=1 AUTO_DOC_UPDATE=0
     - TYPE=debug OS=ubuntu OS_VER=20.04 PUSH_IMAGE=1
     - TYPE=debug OS=ubuntu OS_VER=20.04 COVERAGE=1
     - TYPE=release OS=fedora OS_VER=32

utils/docker/build.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2017-2020, Intel Corporation
+# Copyright 2017-2022, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -118,6 +118,9 @@ if [[ -z "${TRAVIS_BRANCH}" || -z "${TARGET_BRANCHES[${TRAVIS_BRANCH}]}" || "$TR
 	AUTO_DOC_UPDATE=0
 fi
 
+# Check if we are running on a CI (Travis or GitHub Actions)
+[ -n "$GITHUB_ACTIONS" -o -n "$TRAVIS" ] && CI_RUN="YES" || CI_RUN="NO"
+
 WORKDIR=/libpmemobj-cpp
 SCRIPTSDIR=$WORKDIR/utils/docker
 
@@ -133,6 +136,7 @@ docker run --privileged=true --name=$containerName -ti \
 	--env http_proxy=$http_proxy \
 	--env https_proxy=$https_proxy \
 	--env AUTO_DOC_UPDATE=$AUTO_DOC_UPDATE \
+	--env CI_RUN=$CI_RUN \
 	--env GITHUB_TOKEN=$GITHUB_TOKEN \
 	--env WORKDIR=$WORKDIR \
 	--env SCRIPTSDIR=$SCRIPTSDIR \

utils/docker/run-build.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2016-2019, Intel Corporation
+# Copyright 2016-2022, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -81,6 +81,10 @@ function sudo_password() {
 	echo $USERPASS | sudo -Sk $*
 }
 
+if [ "$CI_RUN" == "YES" ]; then
+	sudo_password chown -R $(id -u).$(id -g) $WORKDIR
+fi || true
+
 sudo_password mkdir /mnt/pmem
 sudo_password chmod 0777 /mnt/pmem
 sudo_password mount -o size=2G -t tmpfs none /mnt/pmem