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
Elias Steurer
17cf5e8c97
Fix windows spelling
2020-10-30 16:44:20 +01:00
Elias Steurer
dcc7986ff9
Add benchmark and doctest metrics
2020-10-30 16:40:16 +01:00
Elias Steurer
927973868e
Fix CI
2020-10-30 15:38:19 +01:00
Elias Steurer
536d2623c1
Add doctest and google benchmark
2020-10-30 15:37:00 +01:00
Elias Steurer
4d7807c6dd
Test CI
2020-10-29 21:38:08 +01:00
Elias Steurer
ac48d0005a
Allow linux ci failure for now
2020-10-29 21:36:19 +01:00
Elias Steurer
1adceb6bf6
Add kitware key
2020-10-29 21:28:01 +01:00
Elias Steurer
23d1836df0
Fix CI
2020-10-29 21:22:53 +01:00
Elias Steurer
bca024425a
Add latest cmake instead of 3.10
2020-10-29 21:20:10 +01:00
Elias Steurer
030f85cb21
Fix CI
2020-10-29 21:03:11 +01:00
Elias Steurer
7515bb2140
Add apt update to CI
2020-10-29 21:02:54 +01:00
Elias Steurer
4d1b4dcc95
Test CI
2020-10-29 21:00:47 +01:00
Elias Steurer
f377e0f8b0
Test CI
2020-10-29 20:58:37 +01:00
Elias Steurer
50370a15bb
Test CI
2020-10-29 20:51:33 +01:00
Elias Steurer
f246a5243e
Test CI
2020-10-29 20:44:14 +01:00
Elias Steurer
b5dae423cb
Add new ci build script and check step
...
This is python based and is now functional for windows. We now
should be able to extend this script for linux and mac.
Move setup script to Tools folder.
2020-10-29 18:19:22 +01:00
teppyboy
c1c8863ccb
Fix .gitlab-ci.yml.
...
+ Change "call" to "cmd /c" because i forgot this is PowerShell
2020-10-08 21:58:23 +07:00
teppyboy
729231fd81
Update .gitlab-ci.yml and install_dependencies_windows.bat
...
+ Update .gitlab-ci.yml to call install_dependencies_windows.bat script
+ Update install_dependencies_windows.bat to timeout instead of pause
2020-10-08 21:49:41 +07:00
Elias Steurer
234300f61b
Fix not existing folder
2020-09-27 20:29:57 +02:00
Elias Steurer
1a86a8c8e7
Fix ffmpeg download paths
2020-09-27 19:31:33 +02:00
Elias Steurer
f57537414e
Test CI
2020-09-27 18:53:58 +02:00
Elias Steurer
2dd7659212
Test CI
2020-09-27 17:28:25 +02:00
Elias Steurer
4071ae6a18
Test CI
2020-09-27 17:23:56 +02:00
Elias Steurer
0b201c5dc2
Test CI
2020-09-27 17:13:29 +02:00
Elias Steurer
1fac481a93
Test CI
2020-09-27 17:10:08 +02:00
Elias Steurer
3bf66ba610
Test CI
...
fatal: 'origin/master' does not appear to be a git repository
https://stackoverflow.com/questions/15637507/fatal-origin-does-not-appear-to-be-a-git-repository
2020-09-27 17:07:48 +02:00
Elias Steurer
10c1812999
Test CI
2020-09-27 17:03:08 +02:00
Elias Steurer
38f59261db
Test CI
2020-09-27 17:00:57 +02:00
Elias Steurer
0fa6dc1a9b
Fix CI
2020-09-18 15:39:54 +02:00
Elias Steurer
89ff34fc3c
Fix ci to check if folder exists
2020-09-18 15:33:14 +02:00
Elias Steurer
880c452114
Test CI
2020-09-18 15:27:36 +02:00
Elias Steurer
85c14d25c0
Test CI
2020-09-18 15:25:32 +02:00
Elias Steurer
bc57e8c4c2
Fix CI
2020-09-18 15:12:38 +02:00
Elias Steurer
ad9bea6e7f
Fix CI
2020-09-18 15:09:42 +02:00
Elias Steurer
996d071da3
Change git clone to cmd to ignore error
2020-09-18 14:55:53 +02:00
Elias Steurer
beda4cef39
Change build into gitlab-ci.yml
2020-09-18 14:51:46 +02:00
Elias Steurer
e901a76487
Change install_dependencies_windows to use cmd
2020-09-18 13:46:46 +02:00
Elias Steurer
d7cd880ed7
Update CI to 5.15.1
2020-09-03 19:23:17 +02:00
Elias Steurer
02042f060f
Fix CI
2020-08-11 19:38:58 +02:00
Elias Steurer
d7411d1232
Fix artifact path to contain only bin
2020-08-11 19:33:35 +02:00
Elias Steurer
37241fd2e7
Fix CI artifact paths
2020-08-11 16:19:34 +02:00
Elias Steurer
888f00b31f
Fix CI
2020-08-10 22:07:16 +02:00
Elias Steurer
33a4b940db
Fix CI
2020-08-10 21:49:46 +02:00
Elias Steurer
fa9cd676b0
Fix CI
2020-08-10 21:31:58 +02:00
Elias Steurer
0b31d2b31a
Fix windows c++20 compiler error by updating Qt to 5.14.2
2020-08-10 17:42:49 +02:00
Elias Steurer
e7d4193e2c
Update CI
2020-08-10 16:53:12 +02:00
Elias Steurer
b8b39a21e8
Add qtquickcompiler to ci
2019-12-27 12:33:01 +01:00
Elias Steurer
1aa8fda486
Fix CI windeployqt.exe using an non exsisting folder
2019-12-20 15:56:35 +01:00
Elias Steurer
3acc6d832d
Fix CI
2019-12-13 14:00:43 +01:00
Elias Steurer
3626f5c9a0
Fix CI
2019-12-13 13:47:53 +01:00
Elias Steurer
56429d4ad0
Fix CI
2019-12-13 13:46:31 +01:00
Elias Steurer
139e41f191
Fix syntax
2019-12-13 13:29:56 +01:00
Elias Steurer
41c7b7499b
Add Docs trigger to build the docs on every commit at https://gitlab.com/kelteseth/ScreenPlayDeveloperDocs
2019-12-13 13:28:26 +01:00
Elias Steurer
facf86a45d
Fix CI
2019-12-05 15:53:47 +01:00
Elias Steurer (Kelteseth)
3e6ee76a4f
Update .gitlab-ci.yml
2019-07-29 06:17:30 +00:00
Elias
bc99ead6c7
Add vcpkg to CI
2019-07-26 13:23:45 +02:00
kelteseth
7c8d1ccd0d
Test ci
2018-11-11 16:19:51 +01:00
kelteseth
0fe9e65dd2
Add bsic ci
2018-11-08 21:08:33 +01:00