File tree 3 files changed +6
-4
lines changed
3 files changed +6
-4
lines changed Original file line number Diff line number Diff line change @@ -60,8 +60,8 @@ endif()
60
60
set (HPX_VERSION_MAJOR 1)
61
61
set (HPX_VERSION_MINOR 10)
62
62
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 " )
65
65
66
66
set (HPX_VERSION
67
67
"${HPX_VERSION_MAJOR} .${HPX_VERSION_MINOR} .${HPX_VERSION_SUBMINOR} "
Original file line number Diff line number Diff line change @@ -128,7 +128,7 @@ if(HPX_WITH_GIT_TAG)
128
128
# files to the "latest" directory. The regex only matches full version numbers
129
129
# with three numerical components (X.Y.Z). It does not match release
130
130
# 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]+$" )
132
132
message ("Updating latest directory" )
133
133
set (DOCS_LATEST_DEST "${HPX_BINARY_DIR} /docs/gh-pages/latest" )
134
134
file (REMOVE_RECURSE "${DOCS_LATEST_DEST} " )
@@ -198,7 +198,7 @@ if(NOT "${git_diff_index_result}" EQUAL "0")
198
198
199
199
# push everything up to github
200
200
execute_process (
201
- COMMAND "${GIT_EXECUTABLE} " push
201
+ COMMAND "${GIT_EXECUTABLE} " push --force
202
202
WORKING_DIRECTORY "${HPX_BINARY_DIR} /docs/gh-pages"
203
203
RESULT_VARIABLE git_push_result
204
204
ERROR_VARIABLE git_pull_result_message COMMAND_ECHO STDERR
Original file line number Diff line number Diff line change @@ -97,6 +97,8 @@ Closed issues
97
97
Closed pull requests
98
98
====================
99
99
100
+ * :hpx-pr: `6485 ` - Destructive interference size
101
+ * :hpx-pr: `6484 ` - Improve performance counter error handling
100
102
* :hpx-pr: `6482 ` - Generalize the notion of bitwise serialization
101
103
* :hpx-pr: `6481 ` - Fixing use of HPX_WITH_CXX_STANDARD
102
104
* :hpx-pr: `6480 ` - Remove equal_to from hpx::any
You can’t perform that action at this time.
0 commit comments