1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-22 22:13:35 +02:00
Commit Graph

95 Commits

Author SHA1 Message Date
Ivan Savenko
142bbe652a
Merge pull request #3829 from IvanSavenko/goldmaster
Tweaks for public release mode
2024-04-28 13:11:38 +03:00
Ivan Savenko
225eb88526 Fix CI on beta and master branches 2024-04-26 19:55:14 +03:00
Ivan Savenko
b3499c54ae Added "ENABLE_GOLDMASTER" switch
Intended for functionality that should be disabled or enabled in public
releases.
Largely replaces existing ENABLE_GITVERSION switch, which is now always
disabled if GOLDMASTER is in use
2024-04-25 18:52:25 +03:00
Andrey Filipenkov
a29fa0b94b [CI] use macOS 13 2024-04-13 17:55:01 +03:00
Alexander Wilms
95b35a1063 CI: Accept JSON with comments, but not JSON5 in its entirety 2024-02-12 00:49:57 +01:00
Alexander Wilms
1fa3447ee7 CI: Fix Ccache for branches other than develop in forks of vcmi/vcmi 2024-02-12 00:49:45 +01:00
Alexander Wilms
a7c29e2a95 CI: Only use json5 Python package for validation
This simplifies the script and makes the output more readable
2024-02-08 21:13:20 +01:00
Alexander Wilms
5222495701 Run CI on every push to develop branch instead of on a schedule
Also remove logic to skip CI if it already ran for the same commit

This prevents the CI badge in the README from showing a failure due to a skipped CI run and
results in more up-to-date ccache caches for each PR's initial CI run
2024-01-30 20:51:27 +01:00
Alexander Wilms
1975a08a3c Retry cpack until it succeeds 2024-01-23 14:13:35 +00:00
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