Skip to content

Commit f8683aa

Browse files
authored
fix: ci (#261)
* fix: ci * fix ci * fix ci linux
1 parent 1a688db commit f8683aa

6 files changed

Lines changed: 12 additions & 13 deletions

File tree

.github/workflows/linux-static-qt6.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
add-apt-repository ppa:savoury1/build-tools
5959
apt update
6060
apt upgrade -y
61-
apt install -y build-essential git perl cmake ninja-build
61+
apt install -y build-essential git perl cmake ninja-build wget
6262
- name: Checking out sources
6363
uses: actions/checkout@v4
6464
with:
@@ -70,7 +70,7 @@ jobs:
7070
apt install -y libgl1-mesa-dev libglu1-mesa-dev
7171
apt install -y libfontconfig1-dev libfreetype6-dev libx11-dev libx11-xcb-dev libxext-dev libxfixes-dev libxi-dev libxrender-dev libxcb1-dev libxcb-glx0-dev libxcb-keysyms1-dev libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev libxcb-sync0-dev libxcb-xfixes0-dev libxcb-shape0-dev libxcb-randr0-dev libxcb-render-util0-dev libxcb-xinerama0-dev libxkbcommon-dev libxkbcommon-x11-dev
7272
apt install -y libharfbuzz-dev libsm-dev libdrm-dev
73-
apt install '^libxcb.*-dev' libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev libxkbcommon-dev libxkbcommon-x11-dev
73+
apt install -y '^libxcb.*-dev' libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev libxkbcommon-dev libxkbcommon-x11-dev
7474
- name: Install Qt
7575
run: |
7676
cd ..

.github/workflows/macos-qt6.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
targetName: lemon
2828
steps:
2929
- name: Install Qt
30-
uses: jurplel/install-qt-action@v3
30+
uses: jurplel/install-qt-action@v4
3131
with:
3232
version: ${{ matrix.qt_ver }}
3333
cached: ${{ steps.MacosCacheQt.outputs.cache-hit }}

.github/workflows/macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
# echo "${qt_Path}/bin" >> $GITHUB_PATH
4343
- name: Install Qt
4444
if: steps.MacosCacheQt.outputs.cache-hit != 'true'
45-
uses: jurplel/install-qt-action@v3
45+
uses: jurplel/install-qt-action@v4
4646
with:
4747
version: ${{ matrix.qt_ver }}
4848

.github/workflows/windows-qt6.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
include:
2828
- platform: windows-latest
2929
arch: x64
30-
qtarch: win64_msvc2019_64
30+
qtarch: win64_msvc2022_64
3131
fail-fast: false
3232

3333
runs-on: ${{ matrix.platform }}
@@ -43,10 +43,10 @@ jobs:
4343
uses: actions/checkout@v4
4444
with:
4545
submodules: "recursive"
46-
- name: Install Python 3.9 version
46+
- name: Install Python 3.12 version
4747
uses: actions/setup-python@v4
4848
with:
49-
python-version: "3.9"
49+
python-version: "3.12"
5050
architecture: x64
5151
- name: Restoring submodules
5252
run: git submodule update --init
@@ -55,7 +55,6 @@ jobs:
5555
uses: ilammy/msvc-dev-cmd@v1
5656
with:
5757
# 14.1 is for vs2017, 14.2 is vs2019, following the upstream vcpkg build from Qv2ray-deps repo
58-
toolset: 14.2
5958
arch: x64
6059
- name: Cache Qt
6160
id: cache-qt
@@ -64,7 +63,7 @@ jobs:
6463
path: ../Qt
6564
key: QtCache-${{ matrix.platform }}-x64-${{ matrix.qt_version }}
6665
- name: Installing Qt - x64
67-
uses: jurplel/install-qt-action@v3
66+
uses: jurplel/install-qt-action@v4
6867
with:
6968
version: ${{ matrix.qt_version }}
7069
arch: ${{ matrix.qtarch }}

.github/workflows/windows.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ jobs:
4444
uses: actions/checkout@v4
4545
with:
4646
submodules: "recursive"
47-
- name: Install Python 3.9 version
47+
- name: Install Python 3.12 version
4848
uses: actions/setup-python@v4
4949
with:
50-
python-version: "3.9"
50+
python-version: "3.12"
5151
architecture: ${{ matrix.arch }}
5252
- name: Restoring submodules
5353
run: git submodule update --init
@@ -65,7 +65,7 @@ jobs:
6565
path: ../Qt
6666
key: QtCache-${{ matrix.platform }}-${{ matrix.arch }}-${{ matrix.qt_version }}
6767
- name: Installing Qt - ${{ matrix.arch }}
68-
uses: jurplel/install-qt-action@v3
68+
uses: jurplel/install-qt-action@v4
6969
with:
7070
version: ${{ matrix.qt_version }}
7171
arch: ${{ matrix.qtarch }}

makespec/BUILDVERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
274
1+
277

0 commit comments

Comments
 (0)