1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-09-01 16:19:47 +02:00
Commit Graph

108 Commits

Author SHA1 Message Date
Elias Steurer
3740ab9789 Remove installer from steam version
steam version needs no installer
because it is delivered via steam (duh)
2022-07-22 15:24:47 +02:00
Elias Steurer
b53f20bb8e Merge remote-tracking branch 'origin/master'
# Conflicts:
#	.gitlab-ci.yml
2022-07-22 14:31:19 +02:00
Elias Steurer
7192aca313 Remove gitlabs shared runner
it is way to slow anyways
2022-07-22 14:29:57 +02:00
Elias Steurer
717a182af8 Fix cmake argument
x64 argument by vcpkg is
x86_64 in cmake...

Update to Qt 6.3.1
2022-07-22 14:18:04 +02:00
Elias Steurer
8953ed7a22 Add installer to artifacts
Always build arm and x64 osx versions
2022-07-22 14:07:38 +02:00
Elias Steurer
2691479ac8 Fix python not invoked via "-m" 2022-07-22 12:40:04 +02:00
Elias Steurer
0dc9eae861 Fix CI order 2022-04-30 13:50:38 +02:00
Elias Steurer
12b6911635 Merge and adapt change to make it runnable on linux
Move all qml components into a dedicated qml subfolder.  This was needed to fix linker
errors where we would have a folder that has the same name as our executable.
2022-04-30 12:07:54 +02:00
Elias Steurer
12053d9531 Add basic kde setup 2022-04-24 16:38:12 +02:00
Elias Steurer
bf6107b7ce Add missing linux depedency 2022-04-24 10:41:10 +02:00
Elias Steurer
5c138fa8d4 Update to latest vcpkg
Add libxkbcommon for compiling shader
Fix SysInfo not available on osx and linux
2022-04-23 20:15:32 +02:00
Elias Steurer
f0b8c692c9 Bump Qt version to 6.3.0 in the CI 2022-04-23 19:45:38 +02:00
Elias Steurer
a270fac447 Fix linux cmake install 2022-02-17 19:22:28 +01:00
Elias Steurer
40b5b6a7a7 Add cmake 3.23 to regular linux ci 2022-02-17 19:09:07 +01:00
Elias Steurer
0927514ac5 Update to cmake 3.23 to fix IFW 2022-02-17 18:56:31 +01:00
Elias Steurer
1095cfb330 Remove cqtdeployer 2022-02-17 18:20:27 +01:00
Elias Steurer
52cbca200b Update Qt to 6.2.3 and add release stage 2022-02-03 17:30:59 +01:00
Elias Steurer
736a107041 Test CI 2022-01-29 12:28:13 +01:00
Elias Steurer
a1fe840e54 Fix IFW path on linux ci 2022-01-29 12:24:26 +01:00
darkelaina
14a64c9340 Refactor build script 2022-01-04 09:12:03 +00:00
Elias Steurer
6bd7deaa43 Update vcpkg
Fix compilation
Remove unused benchmark
2021-12-02 15:31:05 +01:00
Elias Steurer
6b653bdfdc Merge branch 'master' into qt6-support
# Conflicts:
#	.gitlab-ci.yml
#	CMakeLists.txt
#	ScreenPlay/CMakeLists.txt
#	ScreenPlay/qml/Workshop/Workshop.qml
#	ScreenPlay/qml/Workshop/upload/UploadProjectItem.qml
#	ScreenPlay/translations/ScreenPlay_.ts
#	ScreenPlay/translations/ScreenPlay_de.ts
#	ScreenPlay/translations/ScreenPlay_es.ts
#	ScreenPlay/translations/ScreenPlay_fr.ts
#	ScreenPlay/translations/ScreenPlay_ko.ts
#	ScreenPlay/translations/ScreenPlay_pt_br.ts
#	ScreenPlay/translations/ScreenPlay_ru.ts
#	ScreenPlay/translations/ScreenPlay_vi.qm
#	ScreenPlay/translations/ScreenPlay_vi.ts
#	ScreenPlay/translations/ScreenPlay_zh_cn.ts
2021-09-26 17:56:40 +02:00
Elias Steurer
a2ae2acf77 Remove debug build step
that was not used anyways. Build steam version
and no steam version explicitly
2021-09-26 17:02:25 +02:00
Elias Steurer
920d2afdf5 Remove last 5.x traces 2021-09-10 12:46:30 +02:00
Elias Steurer
77fabfb801 Disable wget output spam 2021-07-25 16:38:11 +02:00
Elias Steurer
613a4d435d Test CI 2021-07-25 16:15:31 +02:00
Elias Steurer
da7decdc81 Add curl zip unzip tar for vcpkg 2021-07-25 15:57:58 +02:00
Elias Steurer
c3ae717dd0 Add git to linux ci installation 2021-07-25 15:50:53 +02:00
Elias Steurer
670a8515d8 Fix linux ci 2021-07-25 15:47:31 +02:00
Elias Steurer
0cd4c38257 Remove manual cmake install 2021-07-25 15:34:15 +02:00
Elias Steurer
0f1ea0d248 Fix linux CI base 2021-07-25 15:32:38 +02:00
Elias Steurer
d76cfd9ff4 Fix yaml 2021-07-25 15:27:51 +02:00
Elias Steurer
1369e22212 Fix ci python scripts and fix linux apt-get 2021-07-25 15:26:48 +02:00
Elias Steurer
6a9bf15ba2 Test linux CI 2021-07-25 15:23:31 +02:00
Elias Steurer
8c344b7c3d Remove explicit workshop loading
This does not really make sense because it (und)loaded the
plugin twice and cause crashes on macos. The new version
now lets the QML engine handle the lifetime.
2021-05-23 17:23:59 +02:00
Elias Steurer
766c793994 Update linux CI image 2021-05-16 14:17:07 +02:00
Elias Steurer
5164a7b916 Change CI to use setup.py 2021-05-16 13:12:24 +02:00
Elias Steurer
7b8a4aacda Remove ci benchmark step 2021-05-13 12:22:46 +02:00
Elias Steurer
4004b4c701 Add allow_failure: true for now 2021-01-23 11:36:14 +01:00
Elias Steurer
d37f403004 Test CI 2021-01-16 18:40:13 +00:00
Elias Steurer
076def3c03 Test CI 2020-11-08 15:30:09 +01:00
Elias Steurer
2e4a937139 Fix missing snap 2020-11-08 15:24:24 +01:00
Elias Steurer
893eec7e32 Fix linux ci compilation 2020-11-08 15:17:59 +01:00
Elias Steurer
f188e6eb1c Fix osx compilation and CI 2020-10-31 19:59:46 +01:00
Elias Steurer
051a31a065 Fix casing and macos build 2020-10-31 19:32:15 +01:00
Elias Steurer
e1f75d639c Add OSX 2020-10-31 19:30:38 +01:00
Elias Steurer
c347c63bef Test CI 2020-10-31 13:47:41 +01:00
Elias Steurer
80d8750b58 Test CI 2020-10-31 13:33:32 +01:00
Elias Steurer
d5ff21725a Add remove everything at the beginning of ci 2020-10-30 17:02:14 +01:00
Elias Steurer
6aadd9a972 Fix missing windows s 2020-10-30 16:53:13 +01:00