Skip to content

Commit 797eac7

Browse files
authored
Merge branch 'CE-Programming:master' into theme-switch
2 parents 4b94557 + f37c24e commit 797eac7

File tree

15 files changed

+649
-151
lines changed

15 files changed

+649
-151
lines changed

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: Build Linux
22

33
permissions:
4+
actions: write
45
contents: write
56
packages: write
67

@@ -51,10 +52,6 @@ jobs:
5152
run: |
5253
sudo sed -i 's/azure\.//' /etc/apt/sources.list
5354
54-
- name: Remove windows-only qt version override in vcpkg.json
55-
run: |
56-
sed -i '/For Windows only/d' ${{ github.workspace }}/gui/qt/vcpkg.json
57-
5855
- name: Install dependencies
5956
run: |
6057
set -e

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: Build macOS
22

33
permissions:
4+
actions: write
45
contents: write
56
packages: write
67

@@ -44,10 +45,6 @@ jobs:
4445
with:
4546
submodules: 'recursive'
4647

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

.github/workflows/build.windows.workflow.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: Build Windows
22

33
permissions:
4+
actions: write
45
contents: write
56
packages: write
67

0 commit comments

Comments
 (0)