kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Revert "[stores] Temporary skip F-Droid to publish urgent hotfix to Google Play"

Browse source 
This reverts commit d23976ead8.

Signed-off-by: Roman Tsisyk <roman@tsisyk.com>
This commit is contained in:
Roman Tsisyk 2024-02-06 16:34:50 +02:00
parent b843ac09eb
commit 7e4d24f9a5
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.github/workflows/android-release.yaml vendored
View file

@ -29,17 +29,15 @@ 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))
# code=$(($(tools/unix/version.sh android_code) + 1))
build=$(tools/unix/version.sh ios_build)
code=$(tools/unix/version.sh android_code)
build=$(($(tools/unix/version.sh ios_build) + 1))
code=$(($(tools/unix/version.sh android_code) + 1))
tag=$version-$build-android
echo "::set-output name=version::$version"
echo "::set-output name=build::$build"
echo "::set-output name=tag::$tag"
echo "::set-output name=code::$code"
# echo "version: ${version}-${build}-FDroid+${code}" > ${{ env.FDROID_VERSION }}
# git add ${{ env.FDROID_VERSION }}
echo "version: ${version}-${build}-FDroid+${code}" > ${{ env.FDROID_VERSION }}
git add ${{ env.FDROID_VERSION }}
{
echo $tag
echo
@ -47,7 +45,7 @@ jobs:
} > ${{ runner.temp }}/tag.txt
branch="${GITHUB_REF#refs/heads/}"
test -n "$branch"
# git commit -m "Bump versions" -s
git commit -m "Bump versions" -s
git tag -a $tag -F ${{ runner.temp }}/tag.txt
git show $tag
git push origin $branch:$branch