Skip to content

Commit 4d51e9d

Browse files
committed
Preparing V1.10.0-rc2
1 parent ead4543 commit 4d51e9d

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ endif()
6060
set(HPX_VERSION_MAJOR 1)
6161
set(HPX_VERSION_MINOR 10)
6262
set(HPX_VERSION_SUBMINOR 0)
63-
set(HPX_VERSION_DATE 20240501)
64-
set(HPX_VERSION_TAG "-rc1")
63+
set(HPX_VERSION_DATE 20240510)
64+
set(HPX_VERSION_TAG "-rc2")
6565

6666
set(HPX_VERSION
6767
"${HPX_VERSION_MAJOR}.${HPX_VERSION_MINOR}.${HPX_VERSION_SUBMINOR}"

cmake/HPX_UpdateGitDocs.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ if(HPX_WITH_GIT_TAG)
128128
# files to the "latest" directory. The regex only matches full version numbers
129129
# with three numerical components (X.Y.Z). It does not match release
130130
# candidates or other non-version tag names.
131-
if("${HPX_WITH_GIT_TAG}" MATCHES "v^[0-9]+\\.[0-9]+\\.[0-9]+$")
131+
if("${HPX_WITH_GIT_TAG}" MATCHES "v[0-9]+\\.[0-9]+\\.[0-9]+$")
132132
message("Updating latest directory")
133133
set(DOCS_LATEST_DEST "${HPX_BINARY_DIR}/docs/gh-pages/latest")
134134
file(REMOVE_RECURSE "${DOCS_LATEST_DEST}")
@@ -198,7 +198,7 @@ if(NOT "${git_diff_index_result}" EQUAL "0")
198198

199199
# push everything up to github
200200
execute_process(
201-
COMMAND "${GIT_EXECUTABLE}" push
201+
COMMAND "${GIT_EXECUTABLE}" push --force
202202
WORKING_DIRECTORY "${HPX_BINARY_DIR}/docs/gh-pages"
203203
RESULT_VARIABLE git_push_result
204204
ERROR_VARIABLE git_pull_result_message COMMAND_ECHO STDERR

docs/sphinx/releases/whats_new_1_10_0.rst

+2
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@ Closed issues
9797
Closed pull requests
9898
====================
9999

100+
* :hpx-pr:`6485` - Destructive interference size
101+
* :hpx-pr:`6484` - Improve performance counter error handling
100102
* :hpx-pr:`6482` - Generalize the notion of bitwise serialization
101103
* :hpx-pr:`6481` - Fixing use of HPX_WITH_CXX_STANDARD
102104
* :hpx-pr:`6480` - Remove equal_to from hpx::any

0 commit comments

Comments
 (0)