From 554ca39774393e58513db31360d251542baabf35 Mon Sep 17 00:00:00 2001 From: octoshrimpy Date: Mon, 13 Nov 2023 14:49:26 -0700 Subject: [PATCH 01/13] adds matrix to readme --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index a409421f..ecc38960 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,8 @@ QUIK is an open source replacement to the [stock messaging app](https://github.c QUIK is not yet available to download, but will be available as an installable APK from the releases tab and F-Droid. +## Matrix Chat +You can meet with the community over at [#quik-sms:matrix.org](https://matrix.to/#/#quik-sms:matrix.org) From 31b260c02b2dac3d39ebc1812b9fe8b1cedbf64c Mon Sep 17 00:00:00 2001 From: octoshrimpy Date: Mon, 13 Nov 2023 14:49:53 -0700 Subject: [PATCH 02/13] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index ecc38960..5a1ad2df 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,7 @@ QUIK is not yet available to download, but will be available as an installable A ## Matrix Chat You can meet with the community over at [#quik-sms:matrix.org](https://matrix.to/#/#quik-sms:matrix.org) + From f990c1756cf88fbfafb2927fe8442e1f7918f2c9 Mon Sep 17 00:00:00 2001 From: octoshrimpy Date: Tue, 14 Nov 2023 11:51:59 -0700 Subject: [PATCH 03/13] Update build-and-release.yml this might fix it --- .github/workflows/build-and-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index 6531c8d0..8dc4dd94 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -18,7 +18,7 @@ jobs: uses: actions/setup-java@v2.5.0 with: distribution: temurin - java-version: "11" + java-version: "17" - name: Set execution flag for gradlew run: chmod +x gradlew - name: Build APK From c41dcc59ebb33198e0bfe93e296685c41783e5ba Mon Sep 17 00:00:00 2001 From: octoshrimpy Date: Tue, 14 Nov 2023 11:58:17 -0700 Subject: [PATCH 04/13] Create readme.md --- releases/readme.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 releases/readme.md diff --git a/releases/readme.md b/releases/readme.md new file mode 100644 index 00000000..9c558e35 --- /dev/null +++ b/releases/readme.md @@ -0,0 +1 @@ +. From 4357231dfd895e0a8b355d8eac842b7037f7ea4e Mon Sep 17 00:00:00 2001 From: octoshrimpy Date: Tue, 14 Nov 2023 11:59:08 -0700 Subject: [PATCH 05/13] Create app-debug.apk --- app/build/outputs/apk/debug/app-debug.apk | 1 + 1 file changed, 1 insertion(+) create mode 100644 app/build/outputs/apk/debug/app-debug.apk diff --git a/app/build/outputs/apk/debug/app-debug.apk b/app/build/outputs/apk/debug/app-debug.apk new file mode 100644 index 00000000..9c558e35 --- /dev/null +++ b/app/build/outputs/apk/debug/app-debug.apk @@ -0,0 +1 @@ +. From 26ca412c73eefffbfefcc0ed5737ae348205aa10 Mon Sep 17 00:00:00 2001 From: octoshrimpy Date: Tue, 14 Nov 2023 12:00:12 -0700 Subject: [PATCH 06/13] Update build-and-release.yml --- .github/workflows/build-and-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index 8dc4dd94..415f7a08 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -27,7 +27,7 @@ jobs: uses: actions/upload-artifact@v1 with: name: apk - path: app/build/outputs/apk/debug/app-debug.apk + path: releases/app-debug.apk release: name: Release APK From a631a0f0b2e6c8e75513eeaa3d0e44ace934e99c Mon Sep 17 00:00:00 2001 From: octoshrimpy Date: Tue, 14 Nov 2023 12:22:52 -0700 Subject: [PATCH 07/13] Update build-and-release.yml --- .github/workflows/build-and-release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index 415f7a08..109c5394 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -27,7 +27,8 @@ jobs: uses: actions/upload-artifact@v1 with: name: apk - path: releases/app-debug.apk + path: presentation/build/outputs/apk/noAnalytics/debug/QKSMS-noAnalytics-debug.apk + release: name: Release APK From 8c4090caeef1e6869268b7eee48b162a6b65858e Mon Sep 17 00:00:00 2001 From: octoshrimpy Date: Tue, 14 Nov 2023 12:30:04 -0700 Subject: [PATCH 08/13] Update build-and-release.yml --- .github/workflows/build-and-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index 109c5394..e1c298c7 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -27,7 +27,7 @@ jobs: uses: actions/upload-artifact@v1 with: name: apk - path: presentation/build/outputs/apk/noAnalytics/debug/QKSMS-noAnalytics-debug.apk + path: presentation/build/outputs/apk/noAnalytics/debug/QKSMS-v3.10.1-noAnalytics-debug.apk release: From f3d387403a8608c38331c21e46fda0a96534a35f Mon Sep 17 00:00:00 2001 From: octoshrimpy Date: Tue, 14 Nov 2023 12:49:13 -0700 Subject: [PATCH 09/13] Update build-and-release.yml --- .github/workflows/build-and-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index e1c298c7..bf9f9db9 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -54,6 +54,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: apk/app-debug.apk + asset_path: presentation/build/outputs/apk/noAnalytics/debug/QKSMS-v3.10.1-noAnalytics-debug.apk asset_name: ${{ github.event.repository.name }}.apk asset_content_type: application/zip From f21a114aff653d6cc642dda755a13fb7b61a6d8f Mon Sep 17 00:00:00 2001 From: octoshrimpy Date: Tue, 14 Nov 2023 12:56:46 -0700 Subject: [PATCH 10/13] Update build-and-release.yml --- .github/workflows/build-and-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index bf9f9db9..36e12bc7 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -55,5 +55,5 @@ jobs: with: upload_url: ${{ steps.create_release.outputs.upload_url }} asset_path: presentation/build/outputs/apk/noAnalytics/debug/QKSMS-v3.10.1-noAnalytics-debug.apk - asset_name: ${{ github.event.repository.name }}.apk + asset_name: QKSMS-v3.10.1-noAnalytics-debug.apk asset_content_type: application/zip From 3ee053c9a4025148ba03f1b27bde56c6f57dac68 Mon Sep 17 00:00:00 2001 From: octoshrimpy Date: Tue, 14 Nov 2023 13:09:21 -0700 Subject: [PATCH 11/13] Update build-and-release.yml --- .github/workflows/build-and-release.yml | 39 +++++++++---------------- 1 file changed, 14 insertions(+), 25 deletions(-) diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index 36e12bc7..163cbae9 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -13,22 +13,23 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2.4.0 + uses: actions/checkout@v3 - name: Setup JDK - uses: actions/setup-java@v2.5.0 + uses: actions/setup-java@v3 with: - distribution: temurin - java-version: "17" + distribution: 'temurin' + java-version: '17' - name: Set execution flag for gradlew run: chmod +x gradlew - name: Build APK - run: bash ./gradlew assembleDebug --stacktrace + run: ./gradlew assembleDebug --stacktrace + - name: Rename APK + run: mv presentation/build/outputs/apk/noAnalytics/debug/QKSMS-v*-noAnalytics-debug.apk presentation/build/outputs/apk/noAnalytics/debug/QKSMS-noAnalytics-debug.apk - name: Upload APK - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v3 with: name: apk - path: presentation/build/outputs/apk/noAnalytics/debug/QKSMS-v3.10.1-noAnalytics-debug.apk - + path: presentation/build/outputs/apk/noAnalytics/debug/QKSMS-noAnalytics-debug.apk release: name: Release APK @@ -36,24 +37,12 @@ jobs: runs-on: ubuntu-latest steps: - name: Download APK from build - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v3 with: name: apk - - name: Create Release - id: create_release - uses: actions/create-release@v1 + - name: Create and upload release + uses: softprops/action-gh-release@v1 + with: + files: presentation/build/outputs/apk/noAnalytics/debug/QKSMS-noAnalytics-debug.apk env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag_name: ${{ github.run_number }} - release_name: ${{ github.event.repository.name }} v${{ github.run_number }} - - name: Upload Release APK - id: upload_release_asset - uses: actions/upload-release-asset@v1.0.1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: presentation/build/outputs/apk/noAnalytics/debug/QKSMS-v3.10.1-noAnalytics-debug.apk - asset_name: QKSMS-v3.10.1-noAnalytics-debug.apk - asset_content_type: application/zip From bd2e3591669c2d8210b23d6cfecca0cd5ef054f4 Mon Sep 17 00:00:00 2001 From: octoshrimpy Date: Tue, 14 Nov 2023 13:30:48 -0700 Subject: [PATCH 12/13] Update build-and-release.yml From 693c86ce6d0ca6ad1edd7e5cc70a6de1fe80422d Mon Sep 17 00:00:00 2001 From: octoshrimpy Date: Tue, 14 Nov 2023 13:40:53 -0700 Subject: [PATCH 13/13] Update build-and-release.yml --- .github/workflows/build-and-release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index 163cbae9..7c096f88 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -35,6 +35,7 @@ jobs: name: Release APK needs: apk runs-on: ubuntu-latest + if: startsWith(github.ref, 'refs/tags/v') steps: - name: Download APK from build uses: actions/download-artifact@v3