diff --git a/.github/workflows/dev-build-linux.yml b/.github/workflows/dev-build-linux.yml index 533142106c..2c6320ed53 100644 --- a/.github/workflows/dev-build-linux.yml +++ b/.github/workflows/dev-build-linux.yml @@ -19,11 +19,10 @@ on: - 'include/**' - 'resource/**' - CMakeLists.txt - workflow_dispatch: jobs: linux-latest: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 with: @@ -32,6 +31,7 @@ jobs: - name: Install GCC-12 run: | sudo apt update + sudo apt upgrade sudo apt install gcc-12 g++-12 - name: Setup ccache @@ -39,15 +39,6 @@ jobs: with: remove_stale_cache: false - - name: Download libraries - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - cd ~ - gh release download --repo aa889788/build-opencv --pattern '*Linux.tar.gz' - gh release download --repo aa889788/build-fastdeploy --pattern '*Linux.tar.gz' - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \; - - name: Build MAA env: CC: ccache gcc-12 @@ -55,15 +46,16 @@ jobs: run: | mkdir -p build cmake -B build \ - -DFASTDEPLOY_INSTALL_DIR=~/fastdeploy \ - -DOpenCV_DIR=~/opencv/lib/cmake/opencv4 \ - -DINSTALL_THIRD_LIBS=ON + -DINSTALL_THIRD_LIBS=ON + # -DFASTDEPLOY_DIRECTORY=~/fastdeploy \ + # -DOPENCV_DIRECTORY=~/opencv/lib/cmake/opencv4 \ cmake --build build mkdir -p install cmake --install build --prefix install - - run: | + - name: tar files + run: | mkdir -p release cd install tar czvf $GITHUB_WORKSPACE/release/MaaAssistantArknights.tar.gz . diff --git a/cmake/opencv.cmake b/cmake/opencv.cmake index cbedb37363..93c1ad3da8 100644 --- a/cmake/opencv.cmake +++ b/cmake/opencv.cmake @@ -40,6 +40,6 @@ if (INSTALL_THIRD_LIBS) if (OpenCV_SHARED) install(DIRECTORY ${OpenCV_INSTALL_PATH}/lib/ DESTINATION . - USE_SOURCE_PERMISSIONS PATTERN "cmake/*" EXCLUDE) + USE_SOURCE_PERMISSIONS PATTERN "cmake" EXCLUDE) endif (OpenCV_SHARED) endif (INSTALL_THIRD_LIBS)