From eae936b8d85c61c74760f9374e78fa63e50ef4f7 Mon Sep 17 00:00:00 2001 From: ZnPdCo Date: Mon, 11 May 2026 12:06:51 +0800 Subject: [PATCH] fix(ci): resolve GitHub Actions warnings - actions/setup-python@v4 -> @v6 (Node.js 24 compatible) - actions/setup-node@v4 -> @v6 (Node.js 24 compatible) - ilammy/msvc-dev-cmd@v1 -> TheMrMilchmann/setup-msvc-dev@v4.0.0 (Node.js 24 runtime) - Remove invalid 'mirror' input from install-qt-action (removed in v4) - Remove invalid 'cached' input from install-qt-action (renamed to 'cache') - Enable built-in cache in install-qt-action, remove redundant actions/cache step - Remove unnecessary 'brew install ninja pkg-config' step on macOS (pre-installed) --- .github/workflows/deploy-manual.yml | 2 +- .github/workflows/macos-qt6.yml | 5 +---- .github/workflows/windows-qt6.yml | 14 +++----------- 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/.github/workflows/deploy-manual.yml b/.github/workflows/deploy-manual.yml index c0107341..ec87a450 100644 --- a/.github/workflows/deploy-manual.yml +++ b/.github/workflows/deploy-manual.yml @@ -21,7 +21,7 @@ jobs: with: fetch-depth: 0 - - uses: actions/setup-node@v4 + - uses: actions/setup-node@v6 with: node-version: 24 cache: 'npm' diff --git a/.github/workflows/macos-qt6.yml b/.github/workflows/macos-qt6.yml index c5ce0a23..cb0f97bd 100644 --- a/.github/workflows/macos-qt6.yml +++ b/.github/workflows/macos-qt6.yml @@ -30,14 +30,11 @@ jobs: uses: jurplel/install-qt-action@v4 with: version: ${{ matrix.qt_ver }} - cached: ${{ steps.MacosCacheQt.outputs.cache-hit }} + cache: true - uses: actions/checkout@v6 with: submodules: true - - name: macOS - ${{ matrix.qt_version }} - Build preparation - Install Packages - run: | - brew install ninja pkg-config - name: build macos run: | cmake . \ diff --git a/.github/workflows/windows-qt6.yml b/.github/workflows/windows-qt6.yml index 333a8d6e..b43d279d 100644 --- a/.github/workflows/windows-qt6.yml +++ b/.github/workflows/windows-qt6.yml @@ -44,7 +44,7 @@ jobs: with: submodules: "recursive" - name: Install Python 3.12 version - uses: actions/setup-python@v4 + uses: actions/setup-python@v6 with: python-version: "3.12" architecture: x64 @@ -52,23 +52,15 @@ jobs: run: git submodule update --init # ========================================================================================================= - name: Install MSVC compiler - uses: ilammy/msvc-dev-cmd@v1 + uses: TheMrMilchmann/setup-msvc-dev@v4.0.0 with: - # 14.1 is for vs2017, 14.2 is vs2019, following the upstream vcpkg build from Qv2ray-deps repo arch: x64 - - name: Cache Qt - id: cache-qt - uses: actions/cache@v5 - with: - path: ../Qt - key: QtCache-${{ matrix.platform }}-x64-${{ matrix.qt_version }} - name: Installing Qt - x64 uses: jurplel/install-qt-action@v4 with: version: ${{ matrix.qt_version }} arch: ${{ matrix.qtarch }} - mirror: "http://mirrors.ocf.berkeley.edu/qt/" - cached: ${{ steps.cache-qt.outputs.cache-hit }} + cache: true setup-python: "false" modules: "qtactiveqt"