From 7e4d24f9a5bca36319ab533d92b7784aeefffa73 Mon Sep 17 00:00:00 2001 From: Roman Tsisyk Date: Tue, 6 Feb 2024 16:34:50 +0200 Subject: [PATCH] Revert "[stores] Temporary skip F-Droid to publish urgent hotfix to Google Play" This reverts commit d23976ead8c8fc83ca34d34e0fe37109e75a1a00. Signed-off-by: Roman Tsisyk --- .github/workflows/android-release.yaml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/android-release.yaml b/.github/workflows/android-release.yaml index 28fa6fc103..975438749a 100644 --- a/.github/workflows/android-release.yaml +++ b/.github/workflows/android-release.yaml @@ -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