From 388b31e5561713f021b5283f46a7ea73018e9c0c Mon Sep 17 00:00:00 2001 From: Alexander Borsuk Date: Tue, 24 May 2022 07:19:14 +0200 Subject: [PATCH] [android] Fixed release tags for FDroid builds +1 was missing when version commits were created Signed-off-by: Alexander Borsuk --- .github/workflows/android-release.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/android-release.yaml b/.github/workflows/android-release.yaml index 2af4717f11..98b1f9b301 100644 --- a/.github/workflows/android-release.yaml +++ b/.github/workflows/android-release.yaml @@ -26,9 +26,11 @@ jobs: git config user.name '${{ github.actor }}' git config user.email '${{ github.actor }}@users.noreply.github.com' version=$(tools/unix/version.sh ios_version) - build=$(tools/unix/version.sh ios_build) - code=$(tools/unix/version.sh android_code) - tag=$(tools/unix/version.sh android_name)-android + # +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)) + tag=$version-$build-android echo "::set-output name=version::$version" echo "::set-output name=build::$build" echo "::set-output name=tag::$tag"