From eaec3a88360530615616a6314cd4f33e7d68699c Mon Sep 17 00:00:00 2001 From: zeppi Date: Fri, 25 Nov 2022 15:11:57 -0500 Subject: [PATCH 01/35] test setup step --- .github/workflows/deploy.yml | 34 ++++++++++++++++++++++++++++++++++ .gitignore | 1 + 2 files changed, 35 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 8b137891..2596908b 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1 +1,35 @@ +name: Publish APK +on: + pull_request: + branches: [test-deploy] + +jobs: + build: + runs-on: ubuntu-latest + container: lbry/android-base:platform-28 + steps: + - name: checkout + uses: actions/checkout@v3 + - name: hacky copy # docker image runs ~ as /root, but github actions uses ~=/github/home + run: | + cp -r /root/.buildozer ~/.buildozer/ + - name: setup + run: | + echo "$PGP_PRIVATE_KEY" | gpg --batch --import + echo 'deb https://gitsecret.jfrog.io/artifactory/git-secret-deb git-secret main' >> /etc/apt/sources.list + wget -qO - 'https://gitsecret.jfrog.io/artifactory/api/gpg/key/public' | apt-key add - + apt-get -y update && apt-get -y install build-essential ca-certificates curl git gpg-agent openjdk-8-jdk software-properties-common wget zipalign git-secret + git secret reveal + chmod u+x $GITHUB_WORKSPACE/gradlew + export BUILD_VERSION=$($GITHUB_WORKSPACE/gradlew -p $GITHUB_WORKSPACE -q printVersionName --console=plain | tail -1) + echo $BUILD_VERSION + env: + PGP_PRIVATE_KEY: ${{ secrets.PGP_PRIVATE_KEY }} + KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} + + # - name: Upload math result for job 1 + # uses: actions/upload-artifact@v3 + # with: + # name: homework + # path: math-homework.txt \ No newline at end of file diff --git a/.gitignore b/.gitignore index ee532988..1a2e0dc4 100644 --- a/.gitignore +++ b/.gitignore @@ -67,3 +67,4 @@ app/twitter.properties app/build bin app/debuglib +.vscode -- 2.45.3 From 6ef7d0499f6bb57b542f74252a1dabf347c96463 Mon Sep 17 00:00:00 2001 From: zeppi Date: Fri, 25 Nov 2022 15:13:58 -0500 Subject: [PATCH 02/35] add push condition for action --- .github/workflows/deploy.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 2596908b..d21a5dbe 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -3,6 +3,8 @@ name: Publish APK on: pull_request: branches: [test-deploy] + push: + branches: [test-deploy] jobs: build: -- 2.45.3 From 7a7506eb5fe3883ee7722671114cd2e4a00a1d0e Mon Sep 17 00:00:00 2001 From: zeppi Date: Fri, 25 Nov 2022 15:33:56 -0500 Subject: [PATCH 03/35] verify pwd --- .github/workflows/deploy.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d21a5dbe..8fa477df 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -22,10 +22,7 @@ jobs: echo 'deb https://gitsecret.jfrog.io/artifactory/git-secret-deb git-secret main' >> /etc/apt/sources.list wget -qO - 'https://gitsecret.jfrog.io/artifactory/api/gpg/key/public' | apt-key add - apt-get -y update && apt-get -y install build-essential ca-certificates curl git gpg-agent openjdk-8-jdk software-properties-common wget zipalign git-secret - git secret reveal - chmod u+x $GITHUB_WORKSPACE/gradlew - export BUILD_VERSION=$($GITHUB_WORKSPACE/gradlew -p $GITHUB_WORKSPACE -q printVersionName --console=plain | tail -1) - echo $BUILD_VERSION + pwd env: PGP_PRIVATE_KEY: ${{ secrets.PGP_PRIVATE_KEY }} KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} -- 2.45.3 From 74b5435961b50fa7eb18b7e2cfc5d24fab4373b4 Mon Sep 17 00:00:00 2001 From: zeppi Date: Fri, 25 Nov 2022 19:48:52 -0500 Subject: [PATCH 04/35] verify ls al --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 8fa477df..0dc8bb0b 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -22,7 +22,7 @@ jobs: echo 'deb https://gitsecret.jfrog.io/artifactory/git-secret-deb git-secret main' >> /etc/apt/sources.list wget -qO - 'https://gitsecret.jfrog.io/artifactory/api/gpg/key/public' | apt-key add - apt-get -y update && apt-get -y install build-essential ca-certificates curl git gpg-agent openjdk-8-jdk software-properties-common wget zipalign git-secret - pwd + la -al env: PGP_PRIVATE_KEY: ${{ secrets.PGP_PRIVATE_KEY }} KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} -- 2.45.3 From a5cbf14bea5b3067c4dc3b46b68fd52b0dc709da Mon Sep 17 00:00:00 2001 From: zeppi Date: Fri, 25 Nov 2022 19:50:45 -0500 Subject: [PATCH 05/35] typo ls --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 0dc8bb0b..adbc96c8 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -22,7 +22,7 @@ jobs: echo 'deb https://gitsecret.jfrog.io/artifactory/git-secret-deb git-secret main' >> /etc/apt/sources.list wget -qO - 'https://gitsecret.jfrog.io/artifactory/api/gpg/key/public' | apt-key add - apt-get -y update && apt-get -y install build-essential ca-certificates curl git gpg-agent openjdk-8-jdk software-properties-common wget zipalign git-secret - la -al + ls -al env: PGP_PRIVATE_KEY: ${{ secrets.PGP_PRIVATE_KEY }} KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} -- 2.45.3 From c80876402c01292633cd5bd8652da42a6736f54e Mon Sep 17 00:00:00 2001 From: zeppi Date: Fri, 25 Nov 2022 19:53:13 -0500 Subject: [PATCH 06/35] try gsr --- .github/workflows/deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index adbc96c8..b0c30aa6 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -23,6 +23,7 @@ jobs: wget -qO - 'https://gitsecret.jfrog.io/artifactory/api/gpg/key/public' | apt-key add - apt-get -y update && apt-get -y install build-essential ca-certificates curl git gpg-agent openjdk-8-jdk software-properties-common wget zipalign git-secret ls -al + git secret reveal env: PGP_PRIVATE_KEY: ${{ secrets.PGP_PRIVATE_KEY }} KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} -- 2.45.3 From 0ef598c78d1c424bb07f2ab027d2e1879c319e3c Mon Sep 17 00:00:00 2001 From: zeppi Date: Fri, 25 Nov 2022 20:20:22 -0500 Subject: [PATCH 07/35] try git-secret --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b0c30aa6..3d19cc47 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -23,7 +23,7 @@ jobs: wget -qO - 'https://gitsecret.jfrog.io/artifactory/api/gpg/key/public' | apt-key add - apt-get -y update && apt-get -y install build-essential ca-certificates curl git gpg-agent openjdk-8-jdk software-properties-common wget zipalign git-secret ls -al - git secret reveal + git-secret reveal env: PGP_PRIVATE_KEY: ${{ secrets.PGP_PRIVATE_KEY }} KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} -- 2.45.3 From 72281739f627304999fb25aa4cde96683d899ba3 Mon Sep 17 00:00:00 2001 From: zeppi Date: Fri, 25 Nov 2022 20:28:57 -0500 Subject: [PATCH 08/35] try git init --- .github/workflows/deploy.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 3d19cc47..4734bc23 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -23,6 +23,8 @@ jobs: wget -qO - 'https://gitsecret.jfrog.io/artifactory/api/gpg/key/public' | apt-key add - apt-get -y update && apt-get -y install build-essential ca-certificates curl git gpg-agent openjdk-8-jdk software-properties-common wget zipalign git-secret ls -al + git init + ls -al git-secret reveal env: PGP_PRIVATE_KEY: ${{ secrets.PGP_PRIVATE_KEY }} -- 2.45.3 From c51f324645933016a025b1e277f74e9c17e41ebc Mon Sep 17 00:00:00 2001 From: zeppi Date: Fri, 25 Nov 2022 20:37:28 -0500 Subject: [PATCH 09/35] troubleshooting --- .github/workflows/deploy.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 4734bc23..4ca621bd 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -13,6 +13,11 @@ jobs: steps: - name: checkout uses: actions/checkout@v3 + - name: aftercheckout + run: | + ls -al + ls -al .. + pwd - name: hacky copy # docker image runs ~ as /root, but github actions uses ~=/github/home run: | cp -r /root/.buildozer ~/.buildozer/ @@ -22,6 +27,7 @@ jobs: echo 'deb https://gitsecret.jfrog.io/artifactory/git-secret-deb git-secret main' >> /etc/apt/sources.list wget -qO - 'https://gitsecret.jfrog.io/artifactory/api/gpg/key/public' | apt-key add - apt-get -y update && apt-get -y install build-essential ca-certificates curl git gpg-agent openjdk-8-jdk software-properties-common wget zipalign git-secret + ls -al .. ls -al git init ls -al -- 2.45.3 From b6a2eb2c39e07632b4c6520d473d6f80586df706 Mon Sep 17 00:00:00 2001 From: zeppi Date: Fri, 25 Nov 2022 20:40:52 -0500 Subject: [PATCH 10/35] try git secret init --- .github/workflows/deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 4ca621bd..156bf888 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -30,6 +30,7 @@ jobs: ls -al .. ls -al git init + git secret init ls -al git-secret reveal env: -- 2.45.3 From 8ccfb57713f42248c12e0e4c974a9f0965b7e9a4 Mon Sep 17 00:00:00 2001 From: zeppi Date: Fri, 25 Nov 2022 20:44:29 -0500 Subject: [PATCH 11/35] try init again --- .github/workflows/deploy.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 156bf888..c37cbeaa 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -15,6 +15,8 @@ jobs: uses: actions/checkout@v3 - name: aftercheckout run: | + git init + git secret init ls -al ls -al .. pwd -- 2.45.3 From 9480579b4e78c588de82019792bf42ba6bf7278f Mon Sep 17 00:00:00 2001 From: zeppi Date: Fri, 25 Nov 2022 20:46:24 -0500 Subject: [PATCH 12/35] try --- .github/workflows/deploy.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c37cbeaa..2930849c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -16,7 +16,6 @@ jobs: - name: aftercheckout run: | git init - git secret init ls -al ls -al .. pwd @@ -31,9 +30,6 @@ jobs: apt-get -y update && apt-get -y install build-essential ca-certificates curl git gpg-agent openjdk-8-jdk software-properties-common wget zipalign git-secret ls -al .. ls -al - git init - git secret init - ls -al git-secret reveal env: PGP_PRIVATE_KEY: ${{ secrets.PGP_PRIVATE_KEY }} -- 2.45.3 From e4a708f38eaeb6e0c83900f77874a4d9d80eed7c Mon Sep 17 00:00:00 2001 From: zeppi Date: Fri, 25 Nov 2022 20:48:49 -0500 Subject: [PATCH 13/35] g s r --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 2930849c..f2e191a0 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -30,7 +30,7 @@ jobs: apt-get -y update && apt-get -y install build-essential ca-certificates curl git gpg-agent openjdk-8-jdk software-properties-common wget zipalign git-secret ls -al .. ls -al - git-secret reveal + git secret reveal env: PGP_PRIVATE_KEY: ${{ secrets.PGP_PRIVATE_KEY }} KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} -- 2.45.3 From 681ae1c70c5f25ee13fd0ebe18f0c2e908376ea7 Mon Sep 17 00:00:00 2001 From: zeppi Date: Fri, 25 Nov 2022 20:51:51 -0500 Subject: [PATCH 14/35] git rev-parse inside? --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index f2e191a0..93dc7103 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -30,11 +30,11 @@ jobs: apt-get -y update && apt-get -y install build-essential ca-certificates curl git gpg-agent openjdk-8-jdk software-properties-common wget zipalign git-secret ls -al .. ls -al + git rev-parse --is-inside-work-tree git secret reveal env: PGP_PRIVATE_KEY: ${{ secrets.PGP_PRIVATE_KEY }} KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} - # - name: Upload math result for job 1 # uses: actions/upload-artifact@v3 # with: -- 2.45.3 From 2de5f7d79aef1d2b32db0fdd2632c78f3cc4bb94 Mon Sep 17 00:00:00 2001 From: zeppi Date: Fri, 25 Nov 2022 20:56:19 -0500 Subject: [PATCH 15/35] try global safe hack --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 93dc7103..00f95839 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -15,7 +15,7 @@ jobs: uses: actions/checkout@v3 - name: aftercheckout run: | - git init + git config --global --add safe.directory '*' ls -al ls -al .. pwd -- 2.45.3 From d6eebb51b022c7221abd97654a5bc6958e7477ac Mon Sep 17 00:00:00 2001 From: zeppi Date: Fri, 25 Nov 2022 21:04:36 -0500 Subject: [PATCH 16/35] check git version --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 00f95839..62e2eabe 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -15,9 +15,9 @@ jobs: uses: actions/checkout@v3 - name: aftercheckout run: | - git config --global --add safe.directory '*' ls -al ls -al .. + git --version pwd - name: hacky copy # docker image runs ~ as /root, but github actions uses ~=/github/home run: | @@ -27,7 +27,7 @@ jobs: echo "$PGP_PRIVATE_KEY" | gpg --batch --import echo 'deb https://gitsecret.jfrog.io/artifactory/git-secret-deb git-secret main' >> /etc/apt/sources.list wget -qO - 'https://gitsecret.jfrog.io/artifactory/api/gpg/key/public' | apt-key add - - apt-get -y update && apt-get -y install build-essential ca-certificates curl git gpg-agent openjdk-8-jdk software-properties-common wget zipalign git-secret + apt-get -y update && apt-get -y install build-essential ca-certificates curl gpg-agent openjdk-8-jdk software-properties-common wget zipalign git-secret ls -al .. ls -al git rev-parse --is-inside-work-tree -- 2.45.3 From 130412bbdfde6ffc149414a9eb56fa1bd7960d52 Mon Sep 17 00:00:00 2001 From: zeppi Date: Fri, 25 Nov 2022 21:35:45 -0500 Subject: [PATCH 17/35] upgrade git --- .github/workflows/deploy.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 62e2eabe..b24daa16 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -11,6 +11,13 @@ jobs: runs-on: ubuntu-latest container: lbry/android-base:platform-28 steps: + - name: update git + run: | + apt install -y software-properties-common \ + apt update \ + add-apt-repository -y ppa:git-core/ppa \ + apt update \ + apt install -y git - name: checkout uses: actions/checkout@v3 - name: aftercheckout -- 2.45.3 From 1b34352820a3fb6a259a17cc81c414ec62ac1c28 Mon Sep 17 00:00:00 2001 From: zeppi Date: Fri, 25 Nov 2022 21:40:29 -0500 Subject: [PATCH 18/35] apt-get --- .github/workflows/deploy.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b24daa16..f3820dc2 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -13,11 +13,11 @@ jobs: steps: - name: update git run: | - apt install -y software-properties-common \ - apt update \ + apt-get install -y software-properties-common \ + apt-get update \ add-apt-repository -y ppa:git-core/ppa \ - apt update \ - apt install -y git + apt-get update \ + apt-get install -y git - name: checkout uses: actions/checkout@v3 - name: aftercheckout -- 2.45.3 From 4b96cfd12d934f199a65926a9676106ab8c21695 Mon Sep 17 00:00:00 2001 From: zeppi Date: Fri, 25 Nov 2022 21:43:12 -0500 Subject: [PATCH 19/35] fix apt scripts --- .github/workflows/deploy.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index f3820dc2..757d304f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -13,10 +13,10 @@ jobs: steps: - name: update git run: | - apt-get install -y software-properties-common \ - apt-get update \ - add-apt-repository -y ppa:git-core/ppa \ - apt-get update \ + apt-get install -y software-properties-common + apt-get update + add-apt-repository -y ppa:git-core/ppa + apt-get update apt-get install -y git - name: checkout uses: actions/checkout@v3 -- 2.45.3 From 89436434ff4559790e616d8aa7bae656aa8c1ff2 Mon Sep 17 00:00:00 2001 From: zeppi Date: Fri, 25 Nov 2022 21:56:09 -0500 Subject: [PATCH 20/35] git ownership workaround --- .github/workflows/deploy.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 757d304f..06c05dfd 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -18,6 +18,9 @@ jobs: add-apt-repository -y ppa:git-core/ppa apt-get update apt-get install -y git + - name: work around for permission issue + run: | + git config --global --add safe.directory /__w/lbry-android/lbry-android - name: checkout uses: actions/checkout@v3 - name: aftercheckout -- 2.45.3 From 11b810fe723afbf66ce013483eaee036514ffe24 Mon Sep 17 00:00:00 2001 From: zeppi Date: Fri, 25 Nov 2022 22:09:09 -0500 Subject: [PATCH 21/35] build --- .github/workflows/deploy.yml | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 06c05dfd..8ad97e74 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -11,24 +11,18 @@ jobs: runs-on: ubuntu-latest container: lbry/android-base:platform-28 steps: - - name: update git + - name: update git # container git is too old run: | apt-get install -y software-properties-common apt-get update add-apt-repository -y ppa:git-core/ppa apt-get update apt-get install -y git - - name: work around for permission issue + - name: work around for permission issue # git doesn't trust user that owns the checkout run: | git config --global --add safe.directory /__w/lbry-android/lbry-android - name: checkout uses: actions/checkout@v3 - - name: aftercheckout - run: | - ls -al - ls -al .. - git --version - pwd - name: hacky copy # docker image runs ~ as /root, but github actions uses ~=/github/home run: | cp -r /root/.buildozer ~/.buildozer/ @@ -42,9 +36,23 @@ jobs: ls -al git rev-parse --is-inside-work-tree git secret reveal + chmod u+x $CI_PROJECT_DIR/gradlew + export BUILD_VERSION=$($CI_PROJECT_DIR/gradlew -p $CI_PROJECT_DIR -q printVersionName --console=plain | tail -1) env: PGP_PRIVATE_KEY: ${{ secrets.PGP_PRIVATE_KEY }} KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} + - name: build + run: | + export PATH=/usr/bin:$PATH + export ANDROID_SDK_ROOT=~/.buildozer/android/platform/android-sdk-23 + chmod u+x ./release.sh + ./release.sh + cp bin/browser-$BUILD_VERSION-release__arm.apk /dev/null + cp bin/browser-$BUILD_VERSION-release__arm64.apk /dev/null + env: + PGP_PRIVATE_KEY: ${{ secrets.PGP_PRIVATE_KEY }} + KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} + # - name: Upload math result for job 1 # uses: actions/upload-artifact@v3 # with: -- 2.45.3 From ab498cc8edb53bb2311a29790c9ead4514613902 Mon Sep 17 00:00:00 2001 From: zeppi Date: Fri, 25 Nov 2022 22:10:29 -0500 Subject: [PATCH 22/35] github_workspace --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 8ad97e74..c6dd7550 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -36,8 +36,8 @@ jobs: ls -al git rev-parse --is-inside-work-tree git secret reveal - chmod u+x $CI_PROJECT_DIR/gradlew - export BUILD_VERSION=$($CI_PROJECT_DIR/gradlew -p $CI_PROJECT_DIR -q printVersionName --console=plain | tail -1) + chmod u+x $GITHUB_WORKSPACE/gradlew + export BUILD_VERSION=$($GITHUB_WORKSPACE/gradlew -p $GITHUB_WORKSPACE -q printVersionName --console=plain | tail -1) env: PGP_PRIVATE_KEY: ${{ secrets.PGP_PRIVATE_KEY }} KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} -- 2.45.3 From 2ba7647179a65e335855a47cc49016ac76c5874e Mon Sep 17 00:00:00 2001 From: zeppi Date: Fri, 25 Nov 2022 22:20:25 -0500 Subject: [PATCH 23/35] troubleshoot build --- .github/workflows/deploy.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c6dd7550..90eed095 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -45,6 +45,8 @@ jobs: run: | export PATH=/usr/bin:$PATH export ANDROID_SDK_ROOT=~/.buildozer/android/platform/android-sdk-23 + echo $ANDROID_SDK_ROOT + ls -al ~/ chmod u+x ./release.sh ./release.sh cp bin/browser-$BUILD_VERSION-release__arm.apk /dev/null -- 2.45.3 From 753499fc5cbdf4a8afec96ff2d2d877a426c0b3a Mon Sep 17 00:00:00 2001 From: zeppi Date: Fri, 25 Nov 2022 22:34:23 -0500 Subject: [PATCH 24/35] try newer exoplayer --- app/build.gradle | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0cfc3c44..35b93b0b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -103,11 +103,11 @@ dependencies { implementation 'com.android.billingclient:billing:3.0.2' implementation 'com.google.code.gson:gson:2.8.6' - implementation 'com.google.android.exoplayer:exoplayer-core:2.12.2' - implementation 'com.google.android.exoplayer:exoplayer-dash:2.12.2' - implementation 'com.google.android.exoplayer:exoplayer-ui:2.12.2' - implementation 'com.google.android.exoplayer:extension-cast:2.12.2' - implementation 'com.google.android.exoplayer:extension-mediasession:2.12.2' + implementation 'com.google.android.exoplayer:exoplayer-core:2.15.1' + implementation 'com.google.android.exoplayer:exoplayer-dash:2.15.1' + implementation 'com.google.android.exoplayer:exoplayer-ui:2.15.1' + implementation 'com.google.android.exoplayer:extension-cast:2.15.1' + implementation 'com.google.android.exoplayer:extension-mediasession:2.15.1' implementation 'com.google.android:flexbox:2.0.1' -- 2.45.3 From 576c092902f483a30767d4a84f898cebace46425 Mon Sep 17 00:00:00 2001 From: zeppi Date: Fri, 25 Nov 2022 22:55:48 -0500 Subject: [PATCH 25/35] try updated impls --- app/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 35b93b0b..974913b6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -109,14 +109,14 @@ dependencies { implementation 'com.google.android.exoplayer:extension-cast:2.15.1' implementation 'com.google.android.exoplayer:extension-mediasession:2.15.1' - implementation 'com.google.android:flexbox:2.0.1' + implementation 'com.google.android:flexbox:3.0.1' - implementation 'com.hbb20:ccp:2.3.8' + implementation 'com.hbb20:ccp:2.4.7' implementation 'com.github.chrisbanes:PhotoView:2.3.0' implementation 'com.atlassian.commonmark:commonmark:0.14.0' - implementation 'com.arthenica:mobile-ffmpeg-full-gpl:4.3.1.LTS' + implementation 'com.arthenica:mobile-ffmpeg-full-gpl:4.4.LTS' implementation 'commons-codec:commons-codec:1.15' implementation 'org.bitcoinj:bitcoinj-tools:0.14.7' -- 2.45.3 From 5e0548ce2a6a46ee42ea2eee2260c042f226a014 Mon Sep 17 00:00:00 2001 From: zeppi Date: Fri, 25 Nov 2022 22:59:51 -0500 Subject: [PATCH 26/35] move export ANDROID_SDK_ROOT up --- .github/workflows/deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 90eed095..05fad009 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -38,14 +38,14 @@ jobs: git secret reveal chmod u+x $GITHUB_WORKSPACE/gradlew export BUILD_VERSION=$($GITHUB_WORKSPACE/gradlew -p $GITHUB_WORKSPACE -q printVersionName --console=plain | tail -1) + export PATH=/usr/bin:$PATH + export ANDROID_SDK_ROOT=~/.buildozer/android/platform/android-sdk-23 + echo $ANDROID_SDK_ROOT env: PGP_PRIVATE_KEY: ${{ secrets.PGP_PRIVATE_KEY }} KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} - name: build run: | - export PATH=/usr/bin:$PATH - export ANDROID_SDK_ROOT=~/.buildozer/android/platform/android-sdk-23 - echo $ANDROID_SDK_ROOT ls -al ~/ chmod u+x ./release.sh ./release.sh -- 2.45.3 From 73eab4936538876434b4ab2198884368aae6ab50 Mon Sep 17 00:00:00 2001 From: zeppi Date: Fri, 25 Nov 2022 23:05:28 -0500 Subject: [PATCH 27/35] gradlew stacktrace --- release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.sh b/release.sh index 603ffaa6..d5dfed05 100755 --- a/release.sh +++ b/release.sh @@ -1,5 +1,5 @@ #!/bin/bash -./gradlew assembleRelease --console=plain +./gradlew assembleRelease --console=plain --stacktrace version=$(./gradlew -q printVersionName --console=plain | tail -1) mkdir -p bin/ rm -f bin/* -- 2.45.3 From d5d633122bc6f226076aab1dc329370a0396f345 Mon Sep 17 00:00:00 2001 From: zeppi Date: Fri, 25 Nov 2022 23:23:06 -0500 Subject: [PATCH 28/35] troubleshoot... --- .github/workflows/deploy.yml | 1 + release.sh | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 05fad009..32b02886 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -41,6 +41,7 @@ jobs: export PATH=/usr/bin:$PATH export ANDROID_SDK_ROOT=~/.buildozer/android/platform/android-sdk-23 echo $ANDROID_SDK_ROOT + echo $HOME env: PGP_PRIVATE_KEY: ${{ secrets.PGP_PRIVATE_KEY }} KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} diff --git a/release.sh b/release.sh index d5dfed05..9eaf848c 100755 --- a/release.sh +++ b/release.sh @@ -1,4 +1,6 @@ #!/bin/bash +echo $HOME +echo $ANDROID_SDK_ROOT ./gradlew assembleRelease --console=plain --stacktrace version=$(./gradlew -q printVersionName --console=plain | tail -1) mkdir -p bin/ -- 2.45.3 From 21dc2b2ad6d08f64dfba7cc8bc2c96f6b804bb47 Mon Sep 17 00:00:00 2001 From: zeppi Date: Fri, 25 Nov 2022 23:31:23 -0500 Subject: [PATCH 29/35] test github env android root --- .github/workflows/deploy.yml | 2 ++ release.sh | 1 + 2 files changed, 3 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 32b02886..a65d9dfb 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -41,6 +41,8 @@ jobs: export PATH=/usr/bin:$PATH export ANDROID_SDK_ROOT=~/.buildozer/android/platform/android-sdk-23 echo $ANDROID_SDK_ROOT + echo "ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT" >> $GITHUB_ENV + echo "end of setup home:" echo $HOME env: PGP_PRIVATE_KEY: ${{ secrets.PGP_PRIVATE_KEY }} diff --git a/release.sh b/release.sh index 9eaf848c..2337861a 100755 --- a/release.sh +++ b/release.sh @@ -1,4 +1,5 @@ #!/bin/bash +echo "release.sh" echo $HOME echo $ANDROID_SDK_ROOT ./gradlew assembleRelease --console=plain --stacktrace -- 2.45.3 From da09cc231c9a1ee8fb4f2e26f152c70b777bdd2a Mon Sep 17 00:00:00 2001 From: zeppi Date: Sat, 26 Nov 2022 10:32:55 -0500 Subject: [PATCH 30/35] try odysee android script --- .github/workflows/deploy.yml | 143 ++++++++++++++++++++++------------- 1 file changed, 92 insertions(+), 51 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a65d9dfb..c13dc179 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -7,59 +7,100 @@ on: branches: [test-deploy] jobs: - build: - runs-on: ubuntu-latest - container: lbry/android-base:platform-28 - steps: - - name: update git # container git is too old - run: | - apt-get install -y software-properties-common - apt-get update - add-apt-repository -y ppa:git-core/ppa - apt-get update - apt-get install -y git - - name: work around for permission issue # git doesn't trust user that owns the checkout - run: | - git config --global --add safe.directory /__w/lbry-android/lbry-android - - name: checkout - uses: actions/checkout@v3 - - name: hacky copy # docker image runs ~ as /root, but github actions uses ~=/github/home - run: | - cp -r /root/.buildozer ~/.buildozer/ - - name: setup - run: | - echo "$PGP_PRIVATE_KEY" | gpg --batch --import - echo 'deb https://gitsecret.jfrog.io/artifactory/git-secret-deb git-secret main' >> /etc/apt/sources.list - wget -qO - 'https://gitsecret.jfrog.io/artifactory/api/gpg/key/public' | apt-key add - - apt-get -y update && apt-get -y install build-essential ca-certificates curl gpg-agent openjdk-8-jdk software-properties-common wget zipalign git-secret - ls -al .. - ls -al - git rev-parse --is-inside-work-tree - git secret reveal - chmod u+x $GITHUB_WORKSPACE/gradlew - export BUILD_VERSION=$($GITHUB_WORKSPACE/gradlew -p $GITHUB_WORKSPACE -q printVersionName --console=plain | tail -1) - export PATH=/usr/bin:$PATH - export ANDROID_SDK_ROOT=~/.buildozer/android/platform/android-sdk-23 - echo $ANDROID_SDK_ROOT - echo "ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT" >> $GITHUB_ENV - echo "end of setup home:" - echo $HOME - env: - PGP_PRIVATE_KEY: ${{ secrets.PGP_PRIVATE_KEY }} - KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} - - name: build - run: | - ls -al ~/ - chmod u+x ./release.sh - ./release.sh - cp bin/browser-$BUILD_VERSION-release__arm.apk /dev/null - cp bin/browser-$BUILD_VERSION-release__arm64.apk /dev/null - env: - PGP_PRIVATE_KEY: ${{ secrets.PGP_PRIVATE_KEY }} - KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} + # build: + # runs-on: ubuntu-latest + # container: lbry/android-base:platform-28 + # steps: + # - name: update git # container git is too old + # run: | + # apt-get install -y software-properties-common + # apt-get update + # add-apt-repository -y ppa:git-core/ppa + # apt-get update + # apt-get install -y git + # - name: work around for permission issue # git doesn't trust user that owns the checkout + # run: | + # git config --global --add safe.directory /__w/lbry-android/lbry-android + # - name: checkout + # uses: actions/checkout@v3 + # - name: hacky copy # docker image runs ~ as /root, but github actions uses ~=/github/home + # run: | + # cp -r /root/.buildozer ~/.buildozer/ + # - name: setup + # run: | + # echo "$PGP_PRIVATE_KEY" | gpg --batch --import + # echo 'deb https://gitsecret.jfrog.io/artifactory/git-secret-deb git-secret main' >> /etc/apt/sources.list + # wget -qO - 'https://gitsecret.jfrog.io/artifactory/api/gpg/key/public' | apt-key add - + # apt-get -y update && apt-get -y install build-essential ca-certificates curl gpg-agent openjdk-8-jdk software-properties-common wget zipalign git-secret + # ls -al .. + # ls -al + # git rev-parse --is-inside-work-tree + # git secret reveal + # chmod u+x $GITHUB_WORKSPACE/gradlew + # export BUILD_VERSION=$($GITHUB_WORKSPACE/gradlew -p $GITHUB_WORKSPACE -q printVersionName --console=plain | tail -1) + # export PATH=/usr/bin:$PATH + # export ANDROID_SDK_ROOT=~/.buildozer/android/platform/android-sdk-23 + # echo $ANDROID_SDK_ROOT + # echo "ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT" >> $GITHUB_ENV + # echo "end of setup home:" + # echo $HOME + # env: + # PGP_PRIVATE_KEY: ${{ secrets.PGP_PRIVATE_KEY }} + # KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} + # - name: build + # run: | + # ls -al ~/ + # chmod u+x ./release.sh + # ./release.sh + # cp bin/browser-$BUILD_VERSION-release__arm.apk /dev/null + # cp bin/browser-$BUILD_VERSION-release__arm64.apk /dev/null + # env: + # PGP_PRIVATE_KEY: ${{ secrets.PGP_PRIVATE_KEY }} + # KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} # - name: Upload math result for job 1 # uses: actions/upload-artifact@v3 # with: # name: homework - # path: math-homework.txt \ No newline at end of file + # path: math-homework.txt + build-release: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + + - uses: gradle/wrapper-validation-action@v1 + + - name: Create and checkout branch + # push events already checked out the branch + if: github.event_name == 'pull_request' + run: git checkout -B ${{ github.head_ref }} + + - name: Set up JDK 11 + uses: actions/setup-java@v3 + with: + java-version: '11' + distribution: 'temurin' + cache: 'gradle' + + - name: Reveal secrets + env: + PGP_PRIVATE_KEY: ${{ secrets.PGP_PRIVATE_KEY }} + run: | + sudo apt install git-secret gpg-agent + echo "$PGP_PRIVATE_KEY" | gpg --batch --import + git secret reveal + - name: Install NDK version 21.0.6113669 + run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.0.6113669" + + - name: Build + env: + KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} + run: | + sudo apt install zipalign apksigner + ./release.sh + rm bin/*-unsigned.apk + - name: Upload APK + uses: actions/upload-artifact@v3 + with: + name: app-release + path: bin/*.apk \ No newline at end of file -- 2.45.3 From de1e4c7c5bb0c5bac56a4b6e710dded71548c140 Mon Sep 17 00:00:00 2001 From: zeppi Date: Sat, 26 Nov 2022 10:42:36 -0500 Subject: [PATCH 31/35] chmod gradlew --- .github/workflows/deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c13dc179..ddcaaffa 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -97,6 +97,7 @@ jobs: KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} run: | sudo apt install zipalign apksigner + chmod +x gradlew ./release.sh rm bin/*-unsigned.apk - name: Upload APK -- 2.45.3 From c09109263b39e34081f2c97ac0007e49c846369d Mon Sep 17 00:00:00 2001 From: zeppi Date: Sat, 26 Nov 2022 10:47:56 -0500 Subject: [PATCH 32/35] fix flexbox? --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 974913b6..2d8c8416 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -109,7 +109,7 @@ dependencies { implementation 'com.google.android.exoplayer:extension-cast:2.15.1' implementation 'com.google.android.exoplayer:extension-mediasession:2.15.1' - implementation 'com.google.android:flexbox:3.0.1' + implementation 'com.google.android.flexbox:flexbox:3.0.1' implementation 'com.hbb20:ccp:2.4.7' -- 2.45.3 From 7bfd9be7321ec54a637a869be630632dd72e6145 Mon Sep 17 00:00:00 2001 From: zeppi Date: Sat, 26 Nov 2022 10:58:00 -0500 Subject: [PATCH 33/35] flexbox snapshot? --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 2d8c8416..12dffc5b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -109,7 +109,7 @@ dependencies { implementation 'com.google.android.exoplayer:extension-cast:2.15.1' implementation 'com.google.android.exoplayer:extension-mediasession:2.15.1' - implementation 'com.google.android.flexbox:flexbox:3.0.1' + implementation 'com.google.google:flexbox:-SNAPSHOT' implementation 'com.hbb20:ccp:2.4.7' -- 2.45.3 From b87fcee359a9d61df57b5a4e056826548176b41c Mon Sep 17 00:00:00 2001 From: zeppi Date: Sat, 26 Nov 2022 11:03:23 -0500 Subject: [PATCH 34/35] typo --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 12dffc5b..9d1b06e2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -109,7 +109,7 @@ dependencies { implementation 'com.google.android.exoplayer:extension-cast:2.15.1' implementation 'com.google.android.exoplayer:extension-mediasession:2.15.1' - implementation 'com.google.google:flexbox:-SNAPSHOT' + implementation 'com.github.google:flexbox:-SNAPSHOT' implementation 'com.hbb20:ccp:2.4.7' -- 2.45.3 From 89237a3da03bfd19672f38e940d8027cecc0ff12 Mon Sep 17 00:00:00 2001 From: zeppi Date: Sat, 26 Nov 2022 11:06:34 -0500 Subject: [PATCH 35/35] flexbox 3.0.0 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 9d1b06e2..6a692806 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -109,7 +109,7 @@ dependencies { implementation 'com.google.android.exoplayer:extension-cast:2.15.1' implementation 'com.google.android.exoplayer:extension-mediasession:2.15.1' - implementation 'com.github.google:flexbox:-SNAPSHOT' + implementation 'com.google.android.flexbox:flexbox:3.0.0' implementation 'com.hbb20:ccp:2.4.7' -- 2.45.3