Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/deploy-manual.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/macos-qt6.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 . \
Expand Down
14 changes: 3 additions & 11 deletions .github/workflows/windows-qt6.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,31 +44,23 @@ 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
- name: Restoring submodules
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"

Expand Down
Loading