forked from MaaAssistantArknights/MaaDeps
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: Update the port version whenever possible (#7)
- Loading branch information
Showing
52 changed files
with
1,931 additions
and
10,448 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -47,6 +47,23 @@ jobs: | |
maximum-size: 16GB | ||
disk-root: "D:" | ||
|
||
# - name: Free Disk Space (Ubuntu) for cuda | ||
# if: (runner.os == 'Linux') && (!contains(matrix.arch, 'android')) | ||
# uses: jlumbroso/free-disk-space@main | ||
# with: | ||
# # this might remove tools that are actually needed, | ||
# # if set to "true" but frees about 6 GB | ||
# tool-cache: false | ||
|
||
# # all of these default to true, but feel free to set to | ||
# # "false" if necessary for your workflow | ||
# android: true | ||
# dotnet: true | ||
# haskell: true | ||
# large-packages: true | ||
# docker-images: true | ||
# swap-storage: true | ||
|
||
- uses: actions/checkout@v3 | ||
with: | ||
submodules: "recursive" | ||
|
@@ -56,33 +73,41 @@ jobs: | |
run: | | ||
sudo apt-get update -y | ||
sudo apt-get install -y ninja-build python3-pyelftools elfutils patchelf nasm | ||
sudo apt-get install -y autoconf automake autoconf-archive | ||
- name: Install Cross-Compiler for Linux | ||
if: runner.os == 'Linux' && matrix.arch == 'arm64' | ||
run: | | ||
sudo apt install crossbuild-essential-arm64 | ||
# - uses: Jimver/[email protected] | ||
# if: (runner.os == 'Linux' || runner.os == 'Windows') && (!contains(matrix.arch, 'android')) | ||
# id: cuda-toolkit | ||
# with: | ||
# log-file-suffix: '${{ matrix.arch }}-${{ runner.os }}.txt' | ||
|
||
- uses: nttld/setup-ndk@v1 | ||
if: contains(matrix.arch, 'android') | ||
id: setup-ndk | ||
with: | ||
ndk-version: r27 | ||
ndk-version: r27c | ||
add-to-path: false | ||
|
||
# https://github.com/android/ndk/issues/2032#issuecomment-2274923977 | ||
- name: Fix ndk r27 | ||
if: contains(matrix.arch, 'android') | ||
run: | | ||
FLAGS_PATH=${{ steps.setup-ndk.outputs.ndk-path }}/build/cmake/flags.cmake | ||
FLAGS_CONTENT=$(cat $FLAGS_PATH) | ||
echo -e "cmake_policy(PUSH)\ncmake_policy(SET CMP0057 NEW)\n\n${FLAGS_CONTENT}\n\ncmake_policy(POP)\n" > $FLAGS_PATH | ||
cat $FLAGS_PATH | ||
# - name: Fix ndk r27 | ||
# if: contains(matrix.arch, 'android') | ||
# run: | | ||
# FLAGS_PATH=${{ steps.setup-ndk.outputs.ndk-path }}/build/cmake/flags.cmake | ||
# FLAGS_CONTENT=$(cat $FLAGS_PATH) | ||
# echo -e "cmake_policy(PUSH)\ncmake_policy(SET CMP0057 NEW)\n\n${FLAGS_CONTENT}\n\ncmake_policy(POP)\n" > $FLAGS_PATH | ||
# cat $FLAGS_PATH | ||
|
||
- name: Install Packages on MacOS | ||
if: runner.os == 'macOS' | ||
run: | | ||
brew update | ||
brew install ccache ninja pkg-config nasm bison | ||
brew install autoconf automake autoconf-archive | ||
brew install bash gnu-sed gnu-tar | ||
echo "$(brew --prefix)/opt/gnu-sed/libexec/gnubin" >> $GITHUB_PATH | ||
|
@@ -160,6 +185,7 @@ jobs: | |
- name: Build MaaDeps | ||
env: | ||
ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }} | ||
# CUDAToolkit_ROOT: ${{ steps.cuda-toolkit.outputs.CUDA_PATH }} | ||
run: | | ||
for attempt in 1 2 3 | ||
do | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,7 +8,6 @@ | |
from .vcpkg import triplet | ||
|
||
exclude = [ | ||
"*onnxruntime_providers_shared*", | ||
"*opencv_img_hash*", | ||
] | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,7 +5,6 @@ | |
from .common import resdir | ||
|
||
exclude = [ | ||
"*onnxruntime_providers_shared*", | ||
"*opencv_img_hash*", | ||
] | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,6 @@ | |
import subprocess | ||
|
||
exclude = [ | ||
"*onnxruntime_providers_shared*", | ||
"*opencv_img_hash*", | ||
] | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule vcpkg
updated
2193 files
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index c0c1bfef94..3c879b8958 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -17,7 +17,7 @@ target_link_libraries(boost_process | ||
Boost::asio | ||
Boost::config | ||
Boost::core | ||
- Boost::filesystem | ||
+ $<TARGET_NAME_IF_EXISTS:Boost::filesystem> | ||
Boost::fusion | ||
Boost::iterator | ||
Boost::move | ||
@@ -28,6 +28,10 @@ target_link_libraries(boost_process | ||
Boost::winapi | ||
) | ||
|
||
+if(NOT TARGET Boost::filesystem) | ||
+ target_compile_definitions(boost_process INTERFACE $<$<NOT:$<TARGET_EXISTS:Boost::filesystem>>:BOOST_PROCESS_USE_STD_FS>) | ||
+endif() | ||
+ | ||
if(BUILD_TESTING AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt") | ||
|
||
add_subdirectory(test) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
# Automatically generated by scripts/boost/generate-ports.ps1 | ||
|
||
vcpkg_from_github( | ||
OUT_SOURCE_PATH SOURCE_PATH | ||
REPO boostorg/process | ||
REF boost-${VERSION} | ||
SHA512 f8a5d146d07aad83a2aff1e565026836c833b77daa9697f7680956423e7d8b450b41831c77047afff1e9f716c87d2f9ade6194c21e80cfec33d686a608241c32 | ||
HEAD_REF master | ||
PATCHES | ||
opt-filesystem.patch | ||
|
||
) | ||
|
||
set(FEATURE_OPTIONS "") | ||
boost_configure_and_install( | ||
SOURCE_PATH "${SOURCE_PATH}" | ||
OPTIONS ${FEATURE_OPTIONS} | ||
) |
Oops, something went wrong.