forked from organicmaps/organicmaps-tmp
[build] Fix Android versioning
Caused by ee36eb8d1
"Use today's commits count and two numbers"
Signed-off-by: Roman Tsisyk <roman@tsisyk.com>
This commit is contained in:
parent
2687112499
commit
25a875483e
2 changed files with 6 additions and 1 deletions
2
.github/workflows/android-release.yaml
vendored
2
.github/workflows/android-release.yaml
vendored
|
@ -29,7 +29,7 @@ jobs:
|
|||
version=$(tools/unix/version.sh ios_version)
|
||||
# +1 because below a "Bump versions" commit is created.
|
||||
# TODO: Find a way to refactor FDroid versioning without that additional commit.
|
||||
build=$(($(tools/unix/version.sh ios_build) + 1))
|
||||
build=$(($(tools/unix/version.sh count) + 1))
|
||||
code=$(($(tools/unix/version.sh android_code) + 1))
|
||||
tag=$version-$build-android
|
||||
echo "::set-output name=version::$version"
|
||||
|
|
|
@ -36,6 +36,10 @@ function ios_build {
|
|||
echo "$COUNT.$MINOR.$PATCH"
|
||||
}
|
||||
|
||||
function count {
|
||||
echo "$COUNT"
|
||||
}
|
||||
|
||||
function android_name {
|
||||
echo "$DATE-$COUNT"
|
||||
}
|
||||
|
@ -79,6 +83,7 @@ Where format is one of the following arguments (shows current values):
|
|||
android_code $(android_code)
|
||||
qt_version $(qt_version)
|
||||
qt_int_version $(qt_int_version)
|
||||
count $(count)
|
||||
EOF
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue