mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-09 23:07:35 +07:00
Code Issues Packages Projects Releases Wiki Activity
9,826 Commits 7 Branches 1,036 Tags 1.1 GiB
24c0894f2b
Commit Graph

249 Commits

Author SHA1 Message Date
Yair Morgenstern
869154cc73 4.9.13 2023-12-28 23:31:00 +02:00
Yair Morgenstern
c3216e96eb cleanup 2023-11-28 12:20:18 +02:00
Yair Morgenstern
d0a4111d84 I think I found the conflict - checkout ref! 2023-11-28 12:14:56 +02:00
Yair Morgenstern
50ce8b30b6 Wait after PR merge, so the versioning can be done simply 2023-11-28 12:07:16 +02:00
Yair Morgenstern
e022eb803a Wait after PR merge, so the versioning can be done simply 2023-11-28 12:07:16 +02:00
Yair Morgenstern
208ad8a641 ALL TOGETHER NOW 2023-11-28 11:59:12 +02:00
Yair Morgenstern
0af8cb60a5 Tag does not trigger rebuild - maybe now it will 2023-11-28 11:57:48 +02:00
Yair Morgenstern
9a2c45d9e8 You know what let's just check out the second half 2023-11-28 11:52:45 +02:00
Yair Morgenstern
339815fa41 damn wrong filename 2023-11-28 11:52:24 +02:00
Yair Morgenstern
f5d74ad129 whoops 2023-11-28 11:50:10 +02:00
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
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