From 4d51e9de61186688695dac4862c4ac3087923525 Mon Sep 17 00:00:00 2001
From: Hartmut Kaiser <hartmut.kaiser@gmail.com>
Date: Fri, 10 May 2024 10:53:58 -0500
Subject: [PATCH] Preparing V1.10.0-rc2

---
 CMakeLists.txt                            | 4 ++--
 cmake/HPX_UpdateGitDocs.cmake             | 4 ++--
 docs/sphinx/releases/whats_new_1_10_0.rst | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d6f0f097b5b..18a08b2ee53e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,8 +60,8 @@ endif()
 set(HPX_VERSION_MAJOR 1)
 set(HPX_VERSION_MINOR 10)
 set(HPX_VERSION_SUBMINOR 0)
-set(HPX_VERSION_DATE 20240501)
-set(HPX_VERSION_TAG "-rc1")
+set(HPX_VERSION_DATE 20240510)
+set(HPX_VERSION_TAG "-rc2")
 
 set(HPX_VERSION
     "${HPX_VERSION_MAJOR}.${HPX_VERSION_MINOR}.${HPX_VERSION_SUBMINOR}"
diff --git a/cmake/HPX_UpdateGitDocs.cmake b/cmake/HPX_UpdateGitDocs.cmake
index 092aa4f653dd..e21fba2d7d20 100644
--- a/cmake/HPX_UpdateGitDocs.cmake
+++ b/cmake/HPX_UpdateGitDocs.cmake
@@ -128,7 +128,7 @@ if(HPX_WITH_GIT_TAG)
   # files to the "latest" directory. The regex only matches full version numbers
   # with three numerical components (X.Y.Z). It does not match release
   # candidates or other non-version tag names.
-  if("${HPX_WITH_GIT_TAG}" MATCHES "v^[0-9]+\\.[0-9]+\\.[0-9]+$")
+  if("${HPX_WITH_GIT_TAG}" MATCHES "v[0-9]+\\.[0-9]+\\.[0-9]+$")
     message("Updating latest directory")
     set(DOCS_LATEST_DEST "${HPX_BINARY_DIR}/docs/gh-pages/latest")
     file(REMOVE_RECURSE "${DOCS_LATEST_DEST}")
@@ -198,7 +198,7 @@ if(NOT "${git_diff_index_result}" EQUAL "0")
 
   # push everything up to github
   execute_process(
-    COMMAND "${GIT_EXECUTABLE}" push
+    COMMAND "${GIT_EXECUTABLE}" push --force
     WORKING_DIRECTORY "${HPX_BINARY_DIR}/docs/gh-pages"
     RESULT_VARIABLE git_push_result
     ERROR_VARIABLE git_pull_result_message COMMAND_ECHO STDERR
diff --git a/docs/sphinx/releases/whats_new_1_10_0.rst b/docs/sphinx/releases/whats_new_1_10_0.rst
index c1bdd41be5db..a3ee6decd446 100644
--- a/docs/sphinx/releases/whats_new_1_10_0.rst
+++ b/docs/sphinx/releases/whats_new_1_10_0.rst
@@ -97,6 +97,8 @@ Closed issues
 Closed pull requests
 ====================
 
+* :hpx-pr:`6485` - Destructive interference size
+* :hpx-pr:`6484` - Improve performance counter error handling
 * :hpx-pr:`6482` - Generalize the notion of bitwise serialization
 * :hpx-pr:`6481` - Fixing use of HPX_WITH_CXX_STANDARD
 * :hpx-pr:`6480` - Remove equal_to from hpx::any