1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-16 10:19:47 +02:00
Commit Graph

136 Commits

Author SHA1 Message Date
Alexander Wilms
d937d26b80 CPack isn't used for iOS builds, so only kill XProtect if we're building for macOS
Also wait at most 10 s for XProtect to be killed
2024-01-23 12:45:49 +00:00
Alexander Wilms
81c3339199 Add second workaround for CPack issue on macOS 2024-01-22 23:25:23 +00:00
Ivan Savenko
bd5682ecc3 Merge remote-tracking branch 'vcmi/master' into develop 2024-01-19 13:49:54 +02:00
dependabot[bot]
6604dfb776
Bump actions/checkout from 3 to 4
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-16 04:21:56 +00:00
Alexander Wilms
58f0dbc38b CI: Remove act10ns/slack action, since Slack's own GitHub app is sufficient 2024-01-15 11:11:24 +00:00
Alexander Wilms
03b20b5d58 CI: Add empty lines between steps in workflow file 2024-01-15 11:11:18 +00:00
Alexander Wilms
7c836f1320 Removed the unused EthanSK/git-branch-name-action@v1 action from CI workflow 2024-01-15 10:37:06 +00:00
Ivan Savenko
f863665ede
Merge pull request #3496 from vcmi/dependabot/github_actions/actions/upload-artifact-4
Bump actions/upload-artifact from 3 to 4
2024-01-15 12:21:34 +02:00
Ivan Savenko
62abe9d1e3
Merge pull request #3497 from vcmi/dependabot/github_actions/actions/download-artifact-4
Bump actions/download-artifact from 3 to 4
2024-01-15 12:21:22 +02:00
Ivan Savenko
87b26acdf8
Merge pull request #3495 from vcmi/dependabot/github_actions/act10ns/slack-2
Bump act10ns/slack from 1 to 2
2024-01-15 12:03:39 +02:00
Ivan Savenko
656162dedf
Merge pull request #3494 from vcmi/dependabot/github_actions/actions/setup-python-5
Bump actions/setup-python from 4 to 5
2024-01-15 12:03:15 +02:00
dependabot[bot]
8144165bdb
Bump actions/download-artifact from 3 to 4
Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-14 13:11:18 +00:00
dependabot[bot]
fba3716aa1
Bump actions/upload-artifact from 3 to 4
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-14 13:11:15 +00:00
dependabot[bot]
cbc0190429
Bump act10ns/slack from 1 to 2
Bumps [act10ns/slack](https://github.com/act10ns/slack) from 1 to 2.
- [Release notes](https://github.com/act10ns/slack/releases)
- [Changelog](https://github.com/act10ns/slack/blob/master/RELEASE.md)
- [Commits](https://github.com/act10ns/slack/compare/v1...v2)

---
updated-dependencies:
- dependency-name: act10ns/slack
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-14 13:11:11 +00:00
dependabot[bot]
85d5e360af
Bump actions/setup-python from 4 to 5
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4 to 5.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-14 13:11:08 +00:00
dependabot[bot]
bb0816dd14
Bump octokit/request-action from 2.1.0 to 2.1.9
Bumps [octokit/request-action](https://github.com/octokit/request-action) from 2.1.0 to 2.1.9.
- [Release notes](https://github.com/octokit/request-action/releases)
- [Commits](https://github.com/octokit/request-action/compare/v2.1.0...v2.1.9)

---
updated-dependencies:
- dependency-name: octokit/request-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-14 13:11:04 +00:00
Ivan Savenko
4851b6b830 Do not upload 32-bit builds 2024-01-13 19:37:42 +02:00
Andrii Danylchenko
50b45367dc
Disable tests if no secret exists 2024-01-13 13:50:47 +02:00
Andrii Danylchenko
b9a988a48d
Update github.yml 2024-01-13 13:02:12 +02:00
Andrii Danylchenko
d6213482ed
Update github.yml to enable unit tests from vcmi-test-data repo 2024-01-13 12:54:39 +02:00
Alexander Wilms
f78fe102ac H3 data for unit tests: Use encrypted zip
This is easier than splitting H3bitmap and encrypting each file separately
2024-01-08 19:28:11 +00:00
Alexander Wilms
b1020bdd5b Enable unit tests for Linux CI builds 2024-01-08 19:13:44 +00:00
Alexander Wilms
5e96c90996 CI: Build linux-gcc-test preset with gcc 13
This helps detecting issues with newer gcc versions, like #2866

Fixes #3407
2024-01-04 19:48:16 +00:00
Joakim Thorén
721c189b20 Replace direct usage of CMAKE_CXX_COMPILER_LAUNCHER with ENABLE_CCACHE in CI 2023-12-27 21:17:56 +01:00
Ivan Savenko
80d3d61106 Renamed 'mingw-ubuntu' to 'mingw' to avoid confusion 2023-12-16 14:01:13 +02:00
Ivan Savenko
8da1ee8eed Try to add 32-bit build for Windows / mingw CI 2023-12-15 18:51:00 +02:00
Andrii Danylchenko
8f6d36b015 MSVC: switch to RelWithDebInfo 2023-12-04 07:49:39 +02:00
Andrii Danylchenko
b238796fee MSVC: attempt to get build with pdb 2023-12-03 20:20:59 +02:00
Laserlicht
514811dc89
line ending 2023-11-16 22:42:20 +01:00
Ivan Savenko
29a78c14a2
Merge pull request #3113 from Alexander-Wilms/develop
Fix small issues
2023-10-30 11:02:28 +02:00
Alexander Wilms
248877245e Improve ccache hit rate for PRs 2023-10-29 01:33:40 +00:00
Alexander Wilms
04b3dca773 github.yml: Remove duplicate -prune in line endings stage 2023-10-27 14:28:58 +00:00
Alexander Wilms
941181b8b9 Convert XML files in android/ from CRLF to LF, exclude .bat files from CI check 2023-10-23 13:33:09 +00:00
Alexander Wilms
f63c2ac5db
CI step "Ensure LF line endings": No need to ignore Android files
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2023-10-23 14:55:09 +02:00
Alexander Wilms
7e9a3ea042 CI step "Ensure LF line endings": Don't create subshell for grouped commands 2023-10-22 17:50:16 +00:00
Alexander Wilms
9e84ddc0aa Add CI stage to ensure LF line endings
Based on @josch's command:
https://github.com/vcmi/vcmi/pull/3078#issuecomment-1772150744
2023-10-22 16:12:16 +00:00
Alexander Wilms
5c0c317691 Move JSON validation script to CI folder 2023-10-14 14:22:50 +00:00
Alexander Wilms
ec094006c8 Add separate CMake preset for MSVC build with ccache 2023-10-09 21:51:17 +02:00
Alexander Wilms
65354da5f1 Add CMake preset for iOS build without precompiled headers, which is required for ccache 2023-10-02 05:43:38 +02:00
Alexander Wilms
46d785c371 Fix iOS build with ENABLE_PCH=OFF
https://github.com/vcmi/vcmi/issues/2991#issuecomment-1742066891

Fixes #2991
2023-10-01 18:16:41 +02:00
Alexander Wilms
be17ed1b62 Enable ccache for CI 2023-09-29 23:55:12 +02:00
Alexander Wilms
e0089c76ae Add shebang, use elif and only run on linux-clang-test 2023-09-16 11:32:26 +00:00
Alexander Wilms
512816b223 Only validate JSON on Linux 2023-09-16 00:59:08 +00:00
Alexander Wilms
2394612e28 JSON validation: Support various levels of strictness 2023-09-15 23:47:32 +00:00
Alexander Wilms
f38f2d5b6a Add JSON validation as a CI stage 2023-09-15 22:32:53 +00:00
Ivan Savenko
8576591f6f Add preset that builds in debug mode 2023-07-11 16:12:07 +03:00
Konstantin P
a5d85e70c0 vcmi: do not run tests on CI yet 2023-04-27 20:59:55 +03:00
Konstantin
65eed5339f vcmi: actually enable unit tests 2023-04-27 20:59:55 +03:00
Andrii Danylchenko
4d34c83c0b Android: building aab for release 2023-04-15 11:49:50 +03:00
Andrey Filipenkov
456ede5b17 fix uploading Android APK to server 2023-03-06 21:29:46 +03:00
Konstantin
e4ad6b75f6 vcmi: use qt6 for clang linux build 2023-03-06 00:18:23 +03:00
Andrey Filipenkov
299bf93390 [CI] configure android builds 2023-03-02 12:09:48 +03:00
Andrey Filipenkov
883aeccfe7 prevent CI cancelling other jobs when upload step fails 2023-02-27 10:15:27 +03:00
Andrey Filipenkov
05864821e4 fix uploads of artifacts to VCMI server 2023-02-26 21:38:12 +03:00
Andrey Filipenkov
a3eedbafbe [Conan] lock to v1 2023-02-22 14:00:53 +03:00
Andrey Filipenkov
499f870679 [CI] save artifact file directly
no longer zips whole directory hierarchy out/build/...
2023-02-22 14:00:52 +03:00
Ivan Savenko
e938a9bb6c Removed non-preset build from CI config 2023-01-31 18:14:17 +02:00
Ivan Savenko
a9669578fc Remove MXE action from CI 2023-01-31 18:13:51 +02:00
Konstantin
38ebb62c3e conan: build for 64-bit windows by default
This was strongly suggested by VCMI developers.
2023-01-27 00:11:17 +03:00
Konstantin
57b93e00ca github/workflows: add conan-win32 workflow
This will not work for now, but added for future proof
2023-01-26 23:49:54 +03:00
Ivan Savenko
d52b37fecb Moved strict compilation to CI-only 2023-01-05 17:37:40 +02:00
nordsoft
339846a307 Add build from beta branch for android 2022-12-23 16:42:32 +04:00
nordsoft
25803b3c3a Disable patch version for releases 2022-12-23 13:26:26 +04:00
Andrii Danylchenko
162b3017ce allow building beta branch 2022-12-02 13:16:22 +02:00
Andrii Danylchenko
c7510cb8ae allow uploading beta to build server 2022-12-02 09:23:06 +02:00
Andrey Filipenkov
a5ad4893a7 [CI] use setup-python action
fixes running pip-installed packages without `python3 -m`
2022-11-02 11:07:20 +03:00
Andrey Filipenkov
524ad5ab76 [CI] build iOS with Conan 2022-10-18 20:50:38 +03:00
Andrey Filipenkov
c1ef07a5e4 [Conan] generate all configs by default
env var change: USE_CONAN_WITH_ALL_CONFIGS -> GENERATE_ONLY_BUILT_CONFIG
2022-10-18 10:12:05 +03:00
Andrey Filipenkov
cf34c8da56 [Conan] add option to use Apple system libraries as overrides 2022-10-18 10:11:37 +03:00
Andrey Filipenkov
d3e33b096f prepare CI for iOS 2022-09-24 15:55:23 +03:00
Andrey Filipenkov
861df6fe71 [CI] add ability to run workflow manually 2022-09-20 12:30:14 +03:00
Andrey Filipenkov
753e7905b3 [CI] perform nightly develop builds instead of on each push 2022-09-20 12:30:14 +03:00
Andrey Filipenkov
63409dd700 fix indentation 2022-09-19 11:31:48 +03:00
Andrey Filipenkov
d7650ce9c0
use Conan to make macOS CI builds for both Intel and ARM (#782)
* [CI] append platform to output artifact name if it's given
2022-08-30 17:29:00 +03:00
Nordsoft91
54fab9f0f8
Freeze macos build version to ensure compatibility with older macos v… (#759) 2022-06-21 16:52:49 +03:00
Andrii Danylchenko
b698f32557 Allow features/* branches to be published to downloads 2022-06-11 18:40:24 +03:00
Andrii Danylchenko
6c9b0f5667 Switch back to Release for now 2022-05-27 10:11:44 +03:00
Konstantin
8fc14369a4
CMake presets. (#744)
* CI: use single build action
* CMake: use imported targets
* CI: do not build boost for linux
* CMake: add FORCE_BUNDLED_MINIZIP option
* linux: use external minizip and fuzzylite
* CMake: add presets
* .gitignore: ignore cmake build dirs
* github: use cmake presets
2022-05-26 08:55:20 +03:00
Andrii Danylchenko
e64e331373 Switch to the latest VS generator version 2022-03-05 19:31:47 +02:00
Andrii Danylchenko
ccfa6359ad Trigger andoid build on push 2022-01-04 17:12:24 +02:00
Andrii Danylchenko
2f450f6592 Fix MXE lib address and new compilation issues 2021-09-06 21:27:17 +03:00
Andrii Danylchenko
27b3a88dda Replace App Veyor 2021-08-21 09:32:52 +03:00
Andrii Danylchenko
b00a1dee28 Fix build 2021-07-26 21:02:50 +03:00
Andrii Danylchenko
3cef42fd1a Fix github actions build 2021-07-13 22:50:18 +03:00
Andrii Danylchenko
92a9106e89 Disable publishing builds to download.vcmi.eu except develop. Added artifacts 2021-07-13 14:56:35 +01:00
Andrii Danylchenko
6d8373a473 Configure github actions 2021-07-13 14:56:35 +01:00