From cc5a5a22bda10a52a1816df492cf929b360651ae Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Thu, 7 Dec 2023 14:55:12 +0900
Subject: [PATCH] add Android .apk to release from GitHub Action

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 .github/workflows/android.yml                | 22 ++++++++++++++++++++
 .github/workflows/ubuntu-launchpad-build.yml |  1 -
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index b7aa6bc21..d65036f91 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
     - master
+    - github-action-test
   pull_request:
     branches:
     - master
@@ -17,7 +18,17 @@ jobs:
     - name: checkout sources
       uses: actions/checkout@v1
 
+    - name: create release name
+      id: tag
+      run: |
+        export tag=""
+        export is_latest=false
+        if [ "${{ github.ref_type }}" = "tag" ] ; then tag="${{ github.ref_name }}" ; else tag="latest"; is_latest=true ; fi
+        echo "tag=${tag}" >> $GITHUB_OUTPUT
+        echo "is_latest=${is_latest}" >> $GITHUB_OUTPUT
+
     - name: run build
+      id: build
       env:
          SUBSURFACE_REPO_PATH: ${{ github.workspace }}
       run: |
@@ -40,4 +51,15 @@ jobs:
         git config --global --add safe.directory ${SUBSURFACE_REPO_PATH}
         git config --global --add safe.directory ${SUBSURFACE_REPO_PATH}/libdivecomputer
         bash -x ./subsurface/packaging/android/qmake-build.sh
+        artifacts=$(find $(pwd) -name \*.apk)
+        echo "artifacts=$artifacts" >> $GITHUB_OUTPUT
 
+    - name: upload binaries
+      uses: softprops/action-gh-release@v1
+      with:
+        tag_name: ${{ steps.tag.outputs.tag }}
+        prerelease: ${{ steps.tag.outputs.is_latest }}
+        body: CICD release artifact
+        fail_on_unmatched_files: false
+        files: |
+          ${{ steps.build.ouputs.artifacts }}
diff --git a/.github/workflows/ubuntu-launchpad-build.yml b/.github/workflows/ubuntu-launchpad-build.yml
index 249998e2b..0b15e652d 100644
--- a/.github/workflows/ubuntu-launchpad-build.yml
+++ b/.github/workflows/ubuntu-launchpad-build.yml
@@ -3,7 +3,6 @@ on:
   push:
     branches:
     - master
-    - github-action-test
   pull_request:
     branches:
     - master