From 5a12d8dd26ca8e7cfa60b52c15da0ebc1ede8248 Mon Sep 17 00:00:00 2001
From: Michael Rittmeister <michael@rittmeister.in>
Date: Mon, 15 Jan 2024 02:00:23 +0100
Subject: [PATCH] Fix android & Desktop CI

---
 .github/workflows/ci.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 33ee4ea..cf6bdc5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -85,6 +85,7 @@ jobs:
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v3.0.0-beta.1
       - run: ./gradlew packageReleaseDistributionForCurrentOS -Pcompose.desktop.mac.sign=true --stacktrace
+        shell: bash
       - name: Package Linux Distribution
         if: matrix.os == 'ubuntu-latest'
         run: ./gradlew packageDistributable
@@ -146,9 +147,18 @@ jobs:
           alias: ${{ secrets.KEY_ALIAS }}
           keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
+      # https://github.com/r0adkll/sign-android-release/issues/84#issuecomment-1889636075
+      - name: Setup build tool version variable
+        shell: bash
+        run: |
+          BUILD_TOOL_VERSION=$(ls /usr/local/lib/android/sdk/build-tools/ | tail -n 1)
+          echo "BUILD_TOOL_VERSION=$BUILD_TOOL_VERSION" >> $GITHUB_ENV
+          echo Last build tool version is: $BUILD_TOOL_VERSION
       - uses: r0adkll/sign-android-release@v1
         id: sign_apk
         name: Sign APK
+        env:
+          BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }}
         with:
           releaseDirectory: app/android/build/outputs/apk/release/
           signingKeyBase64: ${{ secrets.KEYSTORE }}