fix: solve ci issues
This commit is contained in:
parent
8f1edf278a
commit
e6b265c95c
8
.github/workflows/release-qt5.yml
vendored
8
.github/workflows/release-qt5.yml
vendored
@ -53,6 +53,7 @@ jobs:
|
|||||||
pacman --noconfirm -S --needed make texinfo automake
|
pacman --noconfirm -S --needed make texinfo automake
|
||||||
pacman --noconfirm -S --needed mingw-w64-x86_64-qt5 mingw-w64-x86_64-angleproject libintl msys2-runtime-devel gettext-devel
|
pacman --noconfirm -S --needed mingw-w64-x86_64-qt5 mingw-w64-x86_64-angleproject libintl msys2-runtime-devel gettext-devel
|
||||||
pacman --noconfirm -S --needed mingw-w64-x86_64-ninja mingw-w64-x86_64-gnupg mingw-w64-x86_64-libarchive
|
pacman --noconfirm -S --needed mingw-w64-x86_64-ninja mingw-w64-x86_64-gnupg mingw-w64-x86_64-libarchive
|
||||||
|
pacman --noconfirm -S --needed mingw-w64-x86_64-gtest
|
||||||
if: matrix.os == 'windows-2019'
|
if: matrix.os == 'windows-2019'
|
||||||
|
|
||||||
- name: Install Dependence (Linux)
|
- name: Install Dependence (Linux)
|
||||||
@ -152,16 +153,15 @@ jobs:
|
|||||||
cd $(echo "/${{github.workspace}}" | sed 's/\\/\//g' | sed 's/://')
|
cd $(echo "/${{github.workspace}}" | sed 's/\\/\//g' | sed 's/://')
|
||||||
cd third_party/mimalloc
|
cd third_party/mimalloc
|
||||||
mkdir build && cd build
|
mkdir build && cd build
|
||||||
cmake -G Ninja -DMI_SECURE=ON ..
|
cmake -G Ninja -DMI_SECURE=ON -DCMAKE_INSTALL_PREFIX=$MSYSTEM_PREFIX .. && ninja
|
||||||
ninja
|
ninja install
|
||||||
sudo ninja install
|
|
||||||
if: matrix.os == 'windows-2019'
|
if: matrix.os == 'windows-2019'
|
||||||
|
|
||||||
- name: Build googletest (Linux)
|
- name: Build googletest (Linux)
|
||||||
run: |
|
run: |
|
||||||
cd ${{github.workspace}}/third_party/googletest
|
cd ${{github.workspace}}/third_party/googletest
|
||||||
mkdir build && cd build
|
mkdir build && cd build
|
||||||
cmake -G Ninja ..
|
cmake -G Ninja -DBUILD_SHARED_LIBS=ON ..
|
||||||
ninja
|
ninja
|
||||||
sudo ninja install
|
sudo ninja install
|
||||||
if: matrix.os == 'ubuntu-20.04'
|
if: matrix.os == 'ubuntu-20.04'
|
||||||
|
7
.github/workflows/release.yml
vendored
7
.github/workflows/release.yml
vendored
@ -180,16 +180,15 @@ jobs:
|
|||||||
cd $(echo "/${{github.workspace}}" | sed 's/\\/\//g' | sed 's/://')
|
cd $(echo "/${{github.workspace}}" | sed 's/\\/\//g' | sed 's/://')
|
||||||
cd third_party/mimalloc
|
cd third_party/mimalloc
|
||||||
mkdir build && cd build
|
mkdir build && cd build
|
||||||
cmake -G Ninja -DMI_SECURE=ON ..
|
cmake -G Ninja -DMI_SECURE=ON -DCMAKE_INSTALL_PREFIX=$MSYSTEM_PREFIX .. && ninja
|
||||||
ninja
|
ninja install
|
||||||
sudo ninja install
|
|
||||||
if: matrix.os == 'windows-2019'
|
if: matrix.os == 'windows-2019'
|
||||||
|
|
||||||
- name: Build googletest (Linux)
|
- name: Build googletest (Linux)
|
||||||
run: |
|
run: |
|
||||||
cd ${{github.workspace}}/third_party/googletest
|
cd ${{github.workspace}}/third_party/googletest
|
||||||
mkdir build && cd build
|
mkdir build && cd build
|
||||||
cmake -G Ninja ..
|
cmake -G Ninja -DBUILD_SHARED_LIBS=ON ..
|
||||||
ninja
|
ninja
|
||||||
sudo ninja install
|
sudo ninja install
|
||||||
if: matrix.os == 'ubuntu-20.04'
|
if: matrix.os == 'ubuntu-20.04'
|
||||||
|
2
modules
2
modules
@ -1 +1 @@
|
|||||||
Subproject commit 328bf940a1bc2a166d60e558833df6b7bd07669f
|
Subproject commit efe066a18f1e6ec36c7a1ebcac80e11a7c1e46da
|
@ -53,15 +53,6 @@ target_compile_definitions(gpgfrontend_core PUBLIC GF_CORE)
|
|||||||
# mimalloc (except apple macos)
|
# mimalloc (except apple macos)
|
||||||
if(NOT APPLE)
|
if(NOT APPLE)
|
||||||
target_link_libraries(gpgfrontend_core PUBLIC mimalloc)
|
target_link_libraries(gpgfrontend_core PUBLIC mimalloc)
|
||||||
|
|
||||||
# use system installed libraries or install it system wide
|
|
||||||
if(MINGW AND NOT STABLE_BUILD_FULL_SDK)
|
|
||||||
set_target_properties(mimalloc
|
|
||||||
PROPERTIES
|
|
||||||
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
|
|
||||||
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# qt-aes
|
# qt-aes
|
||||||
@ -84,28 +75,17 @@ if(MINGW)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
# configure libarchive
|
# configure libarchive
|
||||||
if(NOT MINGW)
|
if(APPLE)
|
||||||
if(APPLE)
|
if(EXISTS "/usr/local/opt/libarchive/include")
|
||||||
if(EXISTS "/usr/local/opt/libarchive/include")
|
set(LibArchive_INCLUDE_DIR "/usr/local/opt/libarchive/include")
|
||||||
set(LibArchive_INCLUDE_DIR "/usr/local/opt/libarchive/include")
|
else()
|
||||||
else()
|
set(LibArchive_INCLUDE_DIR "/opt/homebrew/opt/libarchive/include")
|
||||||
set(LibArchive_INCLUDE_DIR "/opt/homebrew/opt/libarchive/include")
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
find_package(LibArchive REQUIRED)
|
|
||||||
target_include_directories(gpgfrontend_core PRIVATE ${LibArchive_INCLUDE_DIR})
|
|
||||||
else()
|
|
||||||
# use system installed libraries or install it system wide
|
|
||||||
if(NOT STABLE_BUILD_FULL_SDK)
|
|
||||||
set_target_properties(archive
|
|
||||||
PROPERTIES
|
|
||||||
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
|
|
||||||
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
|
|
||||||
)
|
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
find_package(LibArchive REQUIRED)
|
||||||
|
target_include_directories(gpgfrontend_core PRIVATE ${LibArchive_INCLUDE_DIR})
|
||||||
|
|
||||||
# link libarchive
|
# link libarchive
|
||||||
target_link_libraries(gpgfrontend_core PRIVATE archive)
|
target_link_libraries(gpgfrontend_core PRIVATE archive)
|
||||||
|
|
||||||
|
@ -53,15 +53,6 @@ if(XCODE_BUILD)
|
|||||||
XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "${GPGFRONTEND_XOCDE_CODE_SIGN_IDENTITY}")
|
XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "${GPGFRONTEND_XOCDE_CODE_SIGN_IDENTITY}")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# use system installed libraries or install it system wide
|
|
||||||
if(MINGW AND NOT STABLE_BUILD_FULL_SDK)
|
|
||||||
set_target_properties(gtest
|
|
||||||
PROPERTIES
|
|
||||||
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
|
|
||||||
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
|
if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
|
||||||
# lib output path
|
# lib output path
|
||||||
set_target_properties(gpgfrontend_test PROPERTIES
|
set_target_properties(gpgfrontend_test PROPERTIES
|
||||||
|
Loading…
Reference in New Issue
Block a user