Skip to content

Commit acdba11

Browse files
committed
ci: remove windows-only qt version override in vcpkg.json
1 parent 71eec9a commit acdba11

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

.github/workflows/build.linux.workflow.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ jobs:
3737
run: |
3838
sudo sed -i 's/azure\.//' /etc/apt/sources.list
3939
40+
- name: Remove windows-only qt version override in vcpkg.json
41+
run: |
42+
sed -i '/For Windows only/d' ${{ github.workspace }}/CEmu/gui/qt/vcpkg.json
43+
4044
- name: Install dependencies
4145
run: |
4246
set -e

.github/workflows/build.mac.workflow.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ jobs:
2929
with:
3030
submodules: 'recursive'
3131

32+
- name: Remove windows-only qt version override in vcpkg.json
33+
run: |
34+
sed -i '' '/For Windows only/d' ${{ github.workspace }}/CEmu/gui/qt/vcpkg.json
35+
3236
- name: Install dependencies
3337
run: |
3438
set -e

gui/qt/vcpkg.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@
2929
],
3030
"builtin-baseline": "a62ce77d56ee07513b4b67de1ec2daeaebfae51a",
3131
"overrides": [
32-
{
33-
"name": "qtbase",
34-
"version": "6.6.3"
35-
}
32+
{ "name": "qtbase", "version": "6.6.3", "$comment": "For Windows only due to UI issues later. For non-Windows, edited out in CI" }
3633
]
3734
}

0 commit comments

Comments
 (0)