Skip to content

Commit 859e136

Browse files
author
wuxianrong
committed
fix ci
1 parent 6dbb59f commit 859e136

2 files changed

Lines changed: 5 additions & 9 deletions

File tree

.github/workflows/pika.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,16 @@ jobs:
3535
run: |
3636
sudo apt-get update
3737
sudo apt-get install -y autoconf libprotobuf-dev protobuf-compiler clang-tidy
38-
38+
3939
- name: Configure CMake
4040
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
4141
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
42-
run: cmake -B build -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DUSE_PIKA_TOOLS=ON -DCMAKE_CXX_FLAGS_DEBUG=-fsanitize=address -D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
42+
run: cmake -B build -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DUSE_PIKA_TOOLS=ON -DCMAKE_CXX_FLAGS_DEBUG=-fsanitize=address -D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
4343

4444
- name: Build
4545
# Build your program with the given configuration
4646
run: cmake --build build --config ${{ env.BUILD_TYPE }}
4747

48-
- name: Cleanup
49-
run: |
50-
rm -rf ./deps
51-
rm -rf ./buildtrees
52-
5348
- uses: actions/upload-artifact@v4
5449
with:
5550
name: ${{ env.ARTIFACT_PIKA_NAME }}
@@ -260,7 +255,7 @@ jobs:
260255
cp deps/lib/libz.1.dylib tests/integration/
261256
rm -rf ./deps
262257
rm -rf ./buildtree
263-
258+
264259
- name: Unit Test
265260
working-directory: ${{ github.workspace }}
266261
run: |

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ ExternalProject_Add(gflags
177177
URL
178178
https://github.com/gflags/gflags/archive/refs/tags/v2.2.2.tar.gz
179179
URL_HASH
180-
MD5=1a865b93bacfa963201af3f75b7bd64c
180+
MD5=1a865b93bacfa963201af3f75b7bd64c
181181
DOWNLOAD_NO_PROGRESS
182182
1
183183
UPDATE_COMMAND
@@ -191,6 +191,7 @@ ExternalProject_Add(gflags
191191
BUILD_ALWAYS
192192
1
193193
CMAKE_ARGS
194+
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
194195
-DCMAKE_INSTALL_PREFIX=${STAGED_INSTALL_PREFIX}
195196
-DCMAKE_BUILD_TYPE=${LIB_BUILD_TYPE}
196197
-DGFLAGS_NAMESPACE=gflags

0 commit comments

Comments
 (0)