Skip to content

Commit ca155d6

Browse files
committed
ci: vcpkg qtbase override applies to all platforms now, no sed needed
1 parent f4c22de commit ca155d6

File tree

3 files changed

+2
-13
lines changed

3 files changed

+2
-13
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,6 @@ jobs:
5252
run: |
5353
sudo sed -i 's/azure\.//' /etc/apt/sources.list
5454
55-
- name: Remove windows-only qt version override in vcpkg.json
56-
run: |
57-
sed -i '/For Windows only/d' ${{ github.workspace }}/gui/qt/vcpkg.json
58-
5955
- name: Install dependencies
6056
run: |
6157
set -e

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@ jobs:
4545
with:
4646
submodules: 'recursive'
4747

48-
- name: Remove windows-only qt version override in vcpkg.json
49-
run: |
50-
sed -i '' '/For Windows only/d' ${{ github.workspace }}/gui/qt/vcpkg.json
51-
5248
- name: Install dependencies
5349
run: |
5450
set -e

gui/qt/vcpkg.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
{
2525
"name": "qtbase",
2626
"default-features": false,
27-
"features": [ "gui", "network", "widgets", "png" ],
27+
"features": [ "gui", "network", "widgets", "png", "dbus" ],
2828
"platform": "osx"
2929
},
3030
{
@@ -34,8 +34,5 @@
3434
"platform": "linux"
3535
}
3636
],
37-
"builtin-baseline": "a62ce77d56ee07513b4b67de1ec2daeaebfae51a",
38-
"overrides": [
39-
{ "name": "qtbase", "version": "6.9.1", "$comment": "For Windows only due to UI issues later. For non-Windows, edited out in CI" }
40-
]
37+
"builtin-baseline": "a62ce77d56ee07513b4b67de1ec2daeaebfae51a"
4138
}

0 commit comments

Comments
 (0)