Commit Graph

315 Commits

Author SHA1 Message Date
Yair Morgenstern
eb50ea4403 Readymade didn't work, trying my own github script for PR merge 2023-11-28 11:48:55 +02:00
Yair Morgenstern
b0e67376c6 Merge pull request properly 2023-11-28 11:38:15 +02:00
Yair Morgenstern
dbdabbaede Use manual access token to merge PR 2023-11-28 11:36:15 +02:00
Yair Morgenstern
3cf710cc58 Try using git commit created by other people 2023-11-28 11:20:58 +02:00
Yair Morgenstern
84e1c03547 Added patch automation step! 2023-11-28 11:06:40 +02:00
Yair Morgenstern
18673b02b6 Added script to update versions on patch release 2023-11-26 19:06:24 +02:00
Yair Morgenstern
7f426a8b6f
Update feature-request.yml 2023-11-19 23:44:39 +02:00
Yair Morgenstern
53f424d7e7
Delete .github/ISSUE_TEMPLATE/feature_request.md 2023-11-19 23:43:46 +02:00
Yair Morgenstern
101ed5fd39
Update feature-request.yml 2023-11-19 23:43:25 +02:00
Yair Morgenstern
dea962a190
Update feature-request.yml 2023-11-19 23:43:09 +02:00
Yair Morgenstern
e12674db4c
Update feature-request.yml 2023-11-19 23:42:36 +02:00
Yair Morgenstern
436435d78e
Update feature-request.yml 2023-11-19 23:41:51 +02:00
Yair Morgenstern
8c0df2abe9
Update feature-request.yml 2023-11-19 23:41:21 +02:00
Yair Morgenstern
7f365a86e1
Update feature-request.yml 2023-11-19 23:39:28 +02:00
Yair Morgenstern
27ba5e05ec
Create feature-request.yml 2023-11-19 23:34:40 +02:00
Yair Morgenstern
d4db9f3c98
Update bug-report.yml 2023-11-19 23:32:27 +02:00
Yair Morgenstern
f1e91a717b
Update bug-report.yml 2023-11-19 23:31:31 +02:00
Yair Morgenstern
d25e3bec11
Delete .github/ISSUE_TEMPLATE/bug_report.md 2023-11-19 23:29:16 +02:00
Yair Morgenstern
2fe6ef33fa
Create bug-report.yml 2023-11-19 23:28:04 +02:00
Yair Morgenstern
75301502dc 4.8.7-google-play 2023-09-21 15:27:55 +03:00
Yair Morgenstern
b0c997c997 4.8.7 2023-09-21 15:13:45 +03:00
SomeTroglodyte
e59426fb03
Generic Widget/Provider framework for sortable grids (#8962)
* City Overview reorg - adding a Column should get easier

* City Overview reorg - patch

* City Overview reorg - SortableGrid Widget

* SortableGrid Widget - cleanup

* Generalize equalizeColumns

* SortableGrid framework - cleaner v2

* Revert file rename to facilitate merge

* Post-merge missed change

* SortableGrid merge fix

* Resolve wildcard import

* Post-merge fix: showOneTimeNotification

* Post-merge fixes

* Post-merge cleanup

* More Post-merge cleanup

* Fix sort (bug symptom: dependence on column click order)

* Tooltip update to "fix" icons if hideIcons=false

* Allow hideIcons control for grid header Tooltip

* Lint String.tr() Kdoc

* Move getComparator() default implementation to interface

* Nicer getComparator() implementations, better sorting for WLTK column

* Fix "Tooltip update to "fix" icons" reverting tooltip color

* Suppress detekt false positives

* Fix merge error
2023-09-13 19:42:22 +03:00
Yair Morgenstern
fe18a22cf7 4.8.5
Replace double quotes with single ones, so the android deploy works
2023-09-13 12:04:11 +03:00
Yair Morgenstern
bbf2f2ff89 Resolve #9854 - update Windows JDK to Adoptium JDK 11 2023-08-02 15:50:55 +03:00
Yair Morgenstern
19f0cadb1e Steam deploy is failing, and it's not in use anyway, time to say goodbye 2023-07-30 23:31:48 +03:00
Yair Morgenstern
cf1be27e3c awesome-pages test 2 2023-07-02 23:21:30 +03:00
Yair Morgenstern
503e8afa93 Remove awesome-pages since it's causing problems 2023-07-02 17:01:15 +03:00
Yair Morgenstern
599d673cec
Update mkdocs.yml
Add awesome-pages-plugin download
2023-07-02 16:33:03 +03:00
Bob Callaway
ac57bea8c1
upgrade cosign-installer to latest release (#9521)
Signed-off-by: Bob Callaway <bcallaway@google.com>
2023-06-04 19:08:47 +03:00
haimlm
e914f79657
Adding docker build and push workflow, fixing docker build (#9508)
* add docker publish to ghcr.io

* add unciv cmd to dockerfile

* update readme

* Update Dockerfile

* Update Dockerfile

* Update Dockerfile

* Update README.md

* Update README.md

* Update Dockerfile

* Update README.md

* Update and rename docker-publish.yml to dockerPublish.yml

* Update README.md

* Update README.md

* Update dockerPublish.yml

* Update dockerPublish.yml

* Update dockerPublish.yml

* Update dockerPublish.yml

* Update dockerPublish.yml

* Update dockerPublish.yml
2023-06-03 23:30:44 +03:00
Yair Morgenstern
a4fb6a1701 4.6.17 2023-06-03 23:04:24 +03:00
Yair Morgenstern
206adb954d Migrated Linux JRE to latest Adoptium Temurin 2023-05-23 23:36:36 +03:00
alexban011
841a1aa564
ci: improved detekt configuration and ci (#9380)
* ci: improved detekt configuration

it still needs some work but it's getting there

* detekt: separated errors from warnings

Detekt doesn't currently have a mechanism for failing only on specific issues

workaround suggested by the maintainer of Detekt

* rebased on master

* fix: resolve ExplicitItLambdaParameter

* fix: fix last star import
2023-05-14 21:55:36 +03:00
alexban011
0d05a658df
ci: added Detekt code analysis (#9322)
* ci: added Detetk code analysis

* ci: made some configs, removed report generation and renamed yml file
2023-05-10 11:46:16 +03:00
dependabot[bot]
0fb32d8f3f
Bump gradle/gradle-build-action in /.github/workflows (#9302)
Bumps [gradle/gradle-build-action](https://github.com/gradle/gradle-build-action) from 2.3.3 to 2.4.2.
- [Release notes](https://github.com/gradle/gradle-build-action/releases)
- [Commits](https://github.com/gradle/gradle-build-action/compare/v2.3.3...v2.4.2)

---
updated-dependencies:
- dependency-name: gradle/gradle-build-action
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-05-01 19:01:29 +03:00
Yair Morgenstern
0dcc15ccc3 Fixed release notes for new versions 2023-04-03 15:16:27 +03:00
Yair Morgenstern
375bc884f9 Remove old tag function 2023-03-29 12:45:48 +03:00
Yair Morgenstern
90673a60ea get tag from github actions, the 2022 way 2023-03-29 12:44:26 +03:00
Yair Morgenstern
680da3232f Matrix build and deploy *only* for tags 2023-03-11 21:39:51 +02:00
Yair Morgenstern
bebdc46af9 Fix job dependencies 2023-03-11 21:35:00 +02:00
Yair Morgenstern
25717d6507 Better workflow - Android build parallel to JAR 2023-03-11 21:33:24 +02:00
Yair Morgenstern
7ffc1e4eeb Separate large multiplatform tests to be performed once per release, and regular tests for PRs and pushes 2023-03-11 21:01:26 +02:00
Yair Morgenstern
482aed4fdc "build and deploy" only activates on tag 2023-03-08 16:58:30 +02:00
Crsi
5e88dbd7a1
Extended CI with various extra tests, added Java 17 support in unit tests (fixes #8835) (#8839)
* Added a pure build stage with various versions

* Added build artifacts from GitHub CI

* Upgrade mocking and testing libraries

* Extended GitHub CI test stages, added Windows tests

* Fixed job name

* Split some jobs for increased speed due to better parallelism
2023-03-08 16:39:32 +02:00
Yair Morgenstern
a4339ff783 Everyone needs build 2023-03-08 12:29:33 +02:00
Yair Morgenstern
a5f2ffe29b AUR *also* needs build, for the tag and release notes 2023-03-08 12:26:43 +02:00
Yair Morgenstern
d0e4271990 AUR dependant on Github release upload 2023-03-08 12:24:25 +02:00
Yair Morgenstern
8b3e84481c AUR dependant on Github version upload 2023-03-08 12:22:40 +02:00
Yair Morgenstern
030038c585 Even if aab not uploaded, keep going and uploda the APK 2023-03-08 12:16:34 +02:00
Yair Morgenstern
9ebe1370b5 Cleaned up task 'on release' restrictions to be on job level 2023-03-08 12:11:38 +02:00
Yair Morgenstern
cd40aa7653 4.5.5
Fix AUR workflow
2023-03-08 12:06:54 +02:00
Yair Morgenstern
0d12fc7dfc Finalize needs 'build' dependency to get the tag and release notes 2023-03-08 11:11:57 +02:00
Yair Morgenstern
3c272820aa Split upload of Unciv.jar and linux files 2023-03-08 11:02:19 +02:00
Yair Morgenstern
cb286d2865 I don't know where the zip has gone 2023-03-08 10:54:48 +02:00
Yair Morgenstern
3c0af65931 Hopefully fixed packr build 2023-03-08 10:50:45 +02:00
Yair Morgenstern
4e71b7c19f Parallelize Android build, try fix 'no deployed zips' 2023-03-08 10:46:15 +02:00
Yair Morgenstern
66a2e676d3 yaml fix 2023-03-08 10:34:59 +02:00
Yair Morgenstern
05f48b026e separate itch and steam uploads from packr build 2023-03-08 10:27:06 +02:00
Yair Morgenstern
76ce29cc58 fix id 2023-03-08 10:07:43 +02:00
Yair Morgenstern
7cea995093 Multi job deploy 2023-03-08 10:06:48 +02:00
Yair Morgenstern
7986e5750b Change release_body from env to step and job output 2023-03-08 09:44:06 +02:00
Yair Morgenstern
9c6e0b79b1 Move Unciv.jar into correct folder for gradle packr 2023-03-08 09:29:10 +02:00
Yair Morgenstern
4a36d90796 download jar after git setup 2023-03-08 08:51:05 +02:00
Yair Morgenstern
c856c4f8c5 fix job id 2023-03-07 23:07:22 +02:00
Yair Morgenstern
2f7b772153 Test upload 'prerelease' versions when testing Github actions 2023-03-07 23:03:33 +02:00
Yair Morgenstern
2add42b580 Split itch upload to separate job - test5
Need to setup gradle and git repo to actually run dist
In future maybe we can get rid of gradle dist entirely and just run packr directly, not today though
2023-03-07 22:14:18 +02:00
Yair Morgenstern
a76b344aba Split itch upload to separate job - test4
Separated 'packr' gradle task from 'dist' task which builds the JAR
2023-03-07 21:54:41 +02:00
Yair Morgenstern
c52d26bbbb Split itch upload to separate job - test3 2023-03-07 21:06:04 +02:00
Yair Morgenstern
bc0706a30a Split itch upload to separate job - test2 2023-03-07 21:04:10 +02:00
Yair Morgenstern
a1b65487a4 Split itch upload to separate job - test1 2023-03-07 21:02:39 +02:00
Crsi
b9811906ef
Updated checkout CI action to v3 to fix deprecation warnings (#8834) 2023-03-06 15:24:07 +02:00
Yair Morgenstern
6680003555 Do not cache test results!
This problem made translation PRs that passed tests the first time, continue to "pass tests" even after failure
2023-02-14 22:32:02 +02:00
Yair Morgenstern
312f308060 4.4.13 2023-02-09 19:37:51 +02:00
Yair Morgenstern
5c9ea8994c Attempt to fix strange bug in github api (https://github.com/yairm210/Unciv/actions/runs/4136712446/jobs/7151150557) 2023-02-09 19:27:27 +02:00
Aron de Jong
076d9f5245
Fix typo in AUR workflow (#8049) 2022-11-26 18:47:06 +02:00
Yair Morgenstern
422a776510
Gradle action to speed up actions 2022-10-31 20:46:26 +02:00
Yair Morgenstern
f04297acfd Removed use of Anuken packr, removing windows32 builds. 2022-10-12 23:39:57 +03:00
Yair Morgenstern
f976d1da71
Removed old 'wiki update' workflow 2022-10-09 12:23:26 +03:00
Yair Morgenstern
dee6c59bfa
Rename Conflict marking to conflicts.yml 2022-10-09 12:22:08 +03:00
Yair Morgenstern
a17c04619b
Create Conflict marking 2022-10-09 12:21:49 +03:00
Yair Morgenstern
891b609da4 Fixed steam root folder, hopefully now 2022-09-15 14:38:59 +03:00
Yair Morgenstern
d42e495f78 Steam deploy folders, not zips 2022-09-15 14:18:51 +03:00
Yair Morgenstern
8606a662c7 Added steam build, let's check it out! 2022-09-15 13:25:47 +03:00
Aron de Jong
dd31276e5c
Add AUR update workflow (#7715)
Port the update workflow from
https://github.com/Thyrum/aur-packages/blob/master/.github/workflows/unciv-bin.yml
to the Unciv github repository.

This does require adding some secrets to the repository and I don't know
how I would do this.
2022-08-28 23:13:13 +03:00
Yair Morgenstern
25c74addfd Un-broke version release 2022-07-01 10:02:39 +03:00
Timo T
57ed61af41
Save compatibility handling (#7255)
* Add serialization version to GameInfo

* Add handling of incompatible saves due to a dfiferent save version

* Fix compilation?

* Fix ios compilation

* Refactor: Make it clearer that GameInfo serialization version is only supposed to be incremented when it's guaranteed to cause issues & rename to compatibility version

* Update initial version

* Update initial version

* Fix merge mistake
2022-07-01 09:34:41 +03:00
Md. Touhidur Rahman
e73b73ed87
Enable gradle caching for faster CI runs (#6793)
* Enable gradle caching for faster CI runs

Notes:
1. distribution is mandatory in v3
2. zulu is used because it was recommended in wiki

* use temurin
2022-05-14 23:29:11 +03:00
Yair Morgenstern
fb521f3f9d
Update config.yml 2022-05-11 19:12:10 +03:00
Yair Morgenstern
0894f9cb66
Update feature_request.md 2022-05-11 19:11:04 +03:00
Yair Morgenstern
5877d3e62a
Create config.yml 2022-05-11 19:08:07 +03:00
Timo T
1bbf5514cf
Add UncivServer.jar to github release (#6745) 2022-05-11 16:22:21 +03:00
SomeTroglodyte
1bb0643088
Implement fastlane step 1 - minimal framework (#6608)
* Implement fastlane step 1 - minimal framework

* Implement fastlane step 1 - fix en/de swap, encoding and a typo

* Implement fastlane step 1 - fix en-US description empty
2022-04-26 18:37:23 +02:00
Yair Morgenstern
fef993d5dc Don't drop uploads due to itch.io failure 2022-03-17 23:49:32 +02:00
Yair Morgenstern
abfbfd5429 Nicer commit name for version rollout 2022-03-14 11:47:04 +02:00
Yair Morgenstern
9b7d5049b3 Readable deployment documentation 2022-03-09 18:37:15 +02:00
Yair Morgenstern
09ee742833 Documentation for the rollout changes, and replacing the old translation method with the new one 2022-03-09 15:03:40 +02:00
Yair Morgenstern
fb058f7849 Converted translation merging to an octokit node.js file for easier configurability, debugging and developing 2022-03-09 14:45:54 +02:00
Yair Morgenstern
e9e29212a1
Update uncivbot.yml 2022-03-09 13:45:39 +02:00
Yair Morgenstern
0be15cf16d Prepare next version with node.js - now includes buildConfig values 2022-03-09 12:35:30 +02:00
Yair Morgenstern
a0ef2105d1
Update uncivbot.yml 2022-03-09 11:52:06 +02:00