From 85ca72071cedd169e7d8c6651bf8c70acc5ce844 Mon Sep 17 00:00:00 2001 From: Le Tan Date: Sun, 12 May 2024 23:25:39 +0800 Subject: [PATCH] fix --- .github/workflows/ci-linux.yml | 1 + .github/workflows/ci-macos.yml | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml index b2747da59e..47bf58d711 100644 --- a/.github/workflows/ci-linux.yml +++ b/.github/workflows/ci-linux.yml @@ -58,6 +58,7 @@ jobs: sudo DEBIAN_FRONTEND=noninteractive apt-get install -y libfcitx5-qt-dev fcitx-libs-dev extra-cmake-modules libxkbcommon-dev sudo DEBIAN_FRONTEND=noninteractive apt-get install -y tree sudo DEBIAN_FRONTEND=noninteractive apt-get install -y fuse libxcb-cursor-dev + python3 -m pip config set global.break-system-packages true - name: Cache Qt id: cache-qt diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml index 5cecd83035..34023462d9 100644 --- a/.github/workflows/ci-macos.yml +++ b/.github/workflows/ci-macos.yml @@ -37,11 +37,11 @@ jobs: - name: Install a fresh CMake run: | - wget --no-verbose https://github.com/Kitware/CMake/releases/download/v${CMAKE_VER}/cmake-${CMAKE_VER}-Darwin-x86_64.tar.gz - tar xzf cmake-${CMAKE_VER}-Darwin-x86_64.tar.gz + wget --no-verbose https://github.com/Kitware/CMake/releases/download/v${CMAKE_VER}/cmake-${CMAKE_VER}-macos-universal.tar.gz + tar xzf cmake-${CMAKE_VER}-macos-universal.tar.gz sudo rm -f /usr/local/bin/cmake /usr/local/bin/cpack - sudo ln -s ${{runner.workspace}}/cmake-${CMAKE_VER}-Darwin-x86_64/CMake.app/Contents/bin/cmake /usr/local/bin/cmake - sudo ln -s ${{runner.workspace}}/cmake-${CMAKE_VER}-Darwin-x86_64/CMake.app/Contents/bin/cpack /usr/local/bin/cpack + sudo ln -s ${{runner.workspace}}/cmake-${CMAKE_VER}-macos-universal/CMake.app/Contents/bin/cmake /usr/local/bin/cmake + sudo ln -s ${{runner.workspace}}/cmake-${CMAKE_VER}-macos-universal/CMake.app/Contents/bin/cpack /usr/local/bin/cpack working-directory: ${{runner.workspace}} - name: Install macdeployqtfix