Skip to content

Commit 533a758

Browse files
author
wuxianrong
committed
Merge branch 'unstable' of github.com:OpenAtomFoundation/pika into unstable
2 parents 08ba311 + 297a8cc commit 533a758

4 files changed

Lines changed: 32 additions & 11 deletions

File tree

.github/workflows/pika.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ jobs:
4747

4848
- name: Cleanup
4949
run: |
50-
rm -rf ./deps
5150
rm -rf ./buildtrees
5251
5352
- uses: actions/upload-artifact@v4
@@ -108,8 +107,7 @@ jobs:
108107
109108
- name: Cleanup
110109
run: |
111-
rm -rf ./deps
112-
rm -rf ./buildtrees
110+
rm -rf ./buildtrees
113111
114112
- name: Test
115113
working-directory: ${{ github.workspace }}/build
@@ -170,8 +168,7 @@ jobs:
170168
run: |
171169
cp deps/lib/libz.1.dylib .
172170
cp deps/lib/libz.1.dylib tests/integration/
173-
rm -rf ./deps
174-
rm -rf ./buildtree
171+
rm -rf ./buildtrees
175172
176173
- name: Test
177174
working-directory: ${{ github.workspace }}/build

.github/workflows/release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ jobs:
3636
./ci/release-build.sh checksum ${{ github.event.repository.name }} ${{ matrix.name }}
3737
3838
- name: Upload artifacts
39-
uses: actions/upload-artifact@v3
39+
uses: actions/upload-artifact@v4
4040
with:
4141
name: ${{ matrix.name }}
4242
path: build/${{ matrix.name }}
4343

4444
- name: Upload checksum of artifacts
45-
uses: actions/upload-artifact@v3
45+
uses: actions/upload-artifact@v4
4646
with:
4747
name: ${{ matrix.name }}.sha256sum
4848
path: build/${{ matrix.name }}.sha256sum
@@ -74,13 +74,13 @@ jobs:
7474
run: ./ci/release-build.sh checksum ${{ github.event.repository.name }} ${{ env.name }}
7575

7676
- name: Upload artifacts
77-
uses: actions/upload-artifact@v3
77+
uses: actions/upload-artifact@v4
7878
with:
7979
name: ${{ env.name }}
8080
path: build/${{ env.name }}
8181

8282
- name: Upload checksum of artifacts
83-
uses: actions/upload-artifact@v3
83+
uses: actions/upload-artifact@v4
8484
with:
8585
name: ${{ env.name }}.sha256sum
8686
path: build/${{ env.name }}.sha256sum
@@ -91,7 +91,7 @@ jobs:
9191
runs-on: ubuntu-latest
9292
steps:
9393
- name: Download artifacts
94-
uses: actions/download-artifact@v3
94+
uses: actions/download-artifact@v4
9595

9696
- name: Publish release
9797
uses: softprops/action-gh-release@v1

CMakeLists.txt

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,8 @@ ExternalProject_Add(gtest
152152
LOG_INSTALL
153153
1
154154
CMAKE_ARGS
155+
# Force CMake to run with the policy behavior of version 3.5 to avoid cases where a higher version of CMake does not compile
156+
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
155157
-DCMAKE_INSTALL_PREFIX=${STAGED_INSTALL_PREFIX}
156158
-DCMAKE_BUILD_TYPE=${LIB_BUILD_TYPE}
157159
BUILD_ALWAYS
@@ -192,6 +194,8 @@ ExternalProject_Add(gflags
192194
BUILD_ALWAYS
193195
1
194196
CMAKE_ARGS
197+
# Force CMake to run with the policy behavior of version 3.5 to avoid cases where a higher version of CMake does not compile
198+
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
195199
-DCMAKE_INSTALL_PREFIX=${STAGED_INSTALL_PREFIX}
196200
-DCMAKE_BUILD_TYPE=${LIB_BUILD_TYPE}
197201
-DGFLAGS_NAMESPACE=gflags
@@ -266,6 +270,8 @@ ExternalProject_Add(glog
266270
BUILD_ALWAYS
267271
1
268272
CMAKE_ARGS
273+
# Force CMake to run with the policy behavior of version 3.5 to avoid cases where a higher version of CMake does not compile
274+
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
269275
-DCMAKE_INSTALL_PREFIX=${STAGED_INSTALL_PREFIX}
270276
-DCMAKE_BUILD_TYPE=${LIB_BUILD_TYPE}
271277
-DWITH_GFLAGS=ON
@@ -307,6 +313,8 @@ ExternalProject_Add(snappy
307313
LOG_INSTALL
308314
1
309315
CMAKE_ARGS
316+
# Force CMake to run with the policy behavior of version 3.5 to avoid cases where a higher version of CMake does not compile
317+
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
310318
-DCMAKE_INSTALL_PREFIX=${STAGED_INSTALL_PREFIX}
311319
-DCMAKE_BUILD_TYPE=${LIB_BUILD_TYPE}
312320
-DSNAPPY_BUILD_TESTS=OFF
@@ -345,6 +353,8 @@ ExternalProject_Add(zstd
345353
SOURCE_SUBDIR
346354
build/cmake
347355
CMAKE_ARGS
356+
# Force CMake to run with the policy behavior of version 3.5 to avoid cases where a higher version of CMake does not compile
357+
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
348358
-DCMAKE_INSTALL_PREFIX=${STAGED_INSTALL_PREFIX}
349359
-DCMAKE_BUILD_TYPE=${LIB_BUILD_TYPE}
350360
-DBUILD_TESTING=OFF
@@ -381,6 +391,8 @@ ExternalProject_Add(fmt
381391
LOG_INSTALL
382392
1
383393
CMAKE_ARGS
394+
# Force CMake to run with the policy behavior of version 3.5 to avoid cases where a higher version of CMake does not compile
395+
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
384396
-DCMAKE_INSTALL_PREFIX=${STAGED_INSTALL_PREFIX}
385397
-DCMAKE_BUILD_TYPE=${LIB_BUILD_TYPE}
386398
BUILD_ALWAYS
@@ -422,6 +434,8 @@ ExternalProject_Add(lz4
422434
SOURCE_SUBDIR
423435
build/cmake
424436
CMAKE_ARGS
437+
# Force CMake to run with the policy behavior of version 3.5 to avoid cases where a higher version of CMake does not compile
438+
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
425439
-DCMAKE_INSTALL_PREFIX=${STAGED_INSTALL_PREFIX}
426440
-DCMAKE_BUILD_TYPE=${LIB_BUILD_TYPE}
427441
-DBUILD_TESTING=OFF
@@ -458,6 +472,8 @@ ExternalProject_Add(zlib
458472
LOG_INSTALL
459473
1
460474
CMAKE_ARGS
475+
# Force CMake to run with the policy behavior of version 3.5 to avoid cases where a higher version of CMake does not compile
476+
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
461477
-DCMAKE_INSTALL_PREFIX=${STAGED_INSTALL_PREFIX}
462478
-DCMAKE_BUILD_TYPE=${LIB_BUILD_TYPE}
463479
-DZLIB_USE_STATIC_LIBS=ON
@@ -489,6 +505,8 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
489505
LOG_INSTALL
490506
1
491507
CMAKE_ARGS
508+
# Force CMake to run with the policy behavior of version 3.5 to avoid cases where a higher version of CMake does not compile
509+
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
492510
-DCMAKE_INSTALL_PREFIX=${STAGED_INSTALL_PREFIX}
493511
-DCMAKE_BUILD_TYPE=${LIB_BUILD_TYPE}
494512
-DGPERFTOOLS_BUILD_STATIC=ON
@@ -558,6 +576,8 @@ ExternalProject_Add(protobuf
558576
SOURCE_SUBDIR
559577
cmake
560578
CMAKE_ARGS
579+
# Force CMake to run with the policy behavior of version 3.5 to avoid cases where a higher version of CMake does not compile
580+
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
561581
-DCMAKE_INSTALL_PREFIX=${STAGED_INSTALL_PREFIX}
562582
-DCMAKE_BUILD_TYPE=${LIB_BUILD_TYPE}
563583
-DBUILD_SHARED_LIBS=FALSE
@@ -607,6 +627,8 @@ ExternalProject_Add(rocksdb
607627
BUILD_ALWAYS
608628
1
609629
CMAKE_ARGS
630+
# Force CMake to run with the policy behavior of version 3.5 to avoid cases where a higher version of CMake does not compile
631+
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
610632
-DCMAKE_INSTALL_PREFIX=${STAGED_INSTALL_PREFIX}
611633
-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
612634
-DCMAKE_BUILD_TYPE=${LIB_BUILD_TYPE}
@@ -648,6 +670,8 @@ ExternalProject_Add(rediscache
648670
SOURCE_SUBDIR
649671
""
650672
CMAKE_ARGS
673+
# Force CMake to run with the policy behavior of version 3.5 to avoid cases where a higher version of CMake does not compile
674+
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
651675
-DCMAKE_INSTALL_PREFIX=${STAGED_INSTALL_PREFIX}
652676
-DCMAKE_INSTALL_INCLUDEDIR=${INSTALL_INCLUDEDIR}
653677
-DCMAKE_INSTALL_LIBDIR=${INSTALL_LIBDIR}

conf/pika.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ slow-cmd-list :
5151
# List of commands considered as administrative. These commands will be handled by the admin thread pool. Modify this list as needed.
5252
# Default commands: info, ping, monitor
5353
# This parameter is only supported by the CONFIG GET command and not by CONFIG SET.
54-
admin-cmd-list : info, ping, monitor, auth
54+
admin-cmd-list : info, ping, monitor, auth, config
5555

5656
# The number of threads to write DB in slaveNode when replicating.
5757
# It's preferable to set slave's sync-thread-num value close to master's thread-pool-size.

0 commit comments

Comments
 (0)