Skip to content

Commit d50728e

Browse files
CI update (thunder-engine#444)
1 parent 732139f commit d50728e

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

.github/workflows/main.yml

+1
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,7 @@ jobs:
276276
- name: Build Qbs
277277
if: needs.version.outputs.release == 'true'
278278
run: |
279+
git apply patches/patch.diff
279280
qbs build -d thirdparty/qbs -f thirdparty/qbs/qbs.qbs --all-products config:release project.withDocumentation:false project.withDocker:false project.withExamples:false project.withTests:false profile:qt
280281
281282
- name: Build Thunder

patches/patch.diff

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
2+
diff --git a/thirdparty/qbs/src/packages/chocolatey/chocolatey.qbs b/thirdparty/qbs/src/packages/chocolatey/chocolatey.qbs
3+
index 27cc1e489..ff5409378 100644
4+
--- a/thirdparty/qbs/src/packages/chocolatey/chocolatey.qbs
5+
+++ b/thirdparty/qbs/src/packages/chocolatey/chocolatey.qbs
6+
@@ -14,7 +14,7 @@ Product {
7+
id: choco
8+
condition: qbs.targetOS.contains("windows")
9+
names: ["choco"]
10+
- platformPaths: { // TODO: Change to platformSearchPaths in qbs 1.15
11+
+ platformSearchPaths: { // TODO: Change to platformSearchPaths in qbs 1.15
12+
var chocolateyInstall = Environment.getEnv("ChocolateyInstall");
13+
if (chocolateyInstall)
14+
return [FileInfo.joinPaths(chocolateyInstall, "bin")];

0 commit comments

Comments
 (0)