From a85b8d66d7f8abacf76430ab8c63ce5c1546f675 Mon Sep 17 00:00:00 2001 From: zeppi <jessopb@gmail.com> Date: Mon, 21 Nov 2022 10:04:28 -0500 Subject: [PATCH 01/17] test1 --- .github/workflows/deploy.yml | 90 +++++++++++++++++++++++++++++++++++ signing2.pgp | Bin 0 -> 4932 bytes 2 files changed, 90 insertions(+) create mode 100644 signing2.pgp diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 8b13789..00b09d8 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1 +1,91 @@ +name: Publish Assets + +on: + push: + branches: [master] + pull_request: + branches: [master] + +jobs: + build_arm64_aar: + runs-on: ubuntu-latest + container: lbry/android-base:python39 + steps: + - name: checkout + uses: actions/checkout@v3 + - name: export build version + run: echo "BUILD_VERSION"=$(cat $GITHUB_WORKSPACE/src/main/python/main.py | grep --color=never -oP '([0-9]+\.?)+')" >> $GITHUB_ENV + - name: build arm64 aar + run: | + echo "NEXUS_SIGNING_KEYRING_FILE=$GITHUB_WORKSPACE/signing2.pgp" >> $GITHUB_ENV + export PATH=/usr/bin:$PATH + wget -q 'https://eu.crystax.net/download/crystax-ndk-10.3.2-linux-x86_64.tar.xz' -P ~/.buildozer/android/ + tar -xf ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz -C ~/.buildozer/android/ + rm -rf ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9 + ln -s ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21 ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9 + cp -f $GITHUB_WORKSPACE/scripts/build-target-python.sh ~/.buildozer/android/crystax-ndk-10.3.2/build/tools/build-target-python.sh + cp -f $GITHUB_WORKSPACE/scripts/mangled-glibc-syscalls__arm64.h ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21/arch-arm64/usr/include/crystax/bionic/libc/include/sys/mangled-glibc-syscalls.h + cp -f $GITHUB_WORKSPACE/scripts/build-binary.mk ~/.buildozer/android/crystax-ndk-10.3.2/build/core/build-binary.mk + rm -rf ~/.buildozer/android/crystax-ndk-10.3.2/sources/sqlite + cp -Rf $GITHUB_WORKSPACE/scripts/crystax-sources/sqlite ~/.buildozer/android/crystax-ndk-10.3.2/sources/sqlite + rm ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz + mv buildozer.spec.arm64.ci buildozer.spec + chmod u+x ./build-release.sh + ./build-release.sh + cp $GITHUB_WORKSPACE/bin/lbrysdk-${{ env.BUILD_VERSION }}-arm64-v8a-release.aar /dev/null + build_arm_aar: + runs-on: ubuntu-latest + container: lbry/android-base:python39 + steps: + - name: checkout + uses: actions/checkout@v3 + - name: export build version + run: export BUILD_VERSION=$(cat $GITHUB_WORKSPACE/src/main/python/main.py | grep --color=never -oP '([0-9]+\.?)+') + - name: build arm aar + run: | + export NEXUS_SIGNING_KEYRING_FILE=$GITHUB_WORKSPACE/signing2.pgp + export PATH=/usr/bin:$PATH + wget -q 'https://eu.crystax.net/download/crystax-ndk-10.3.2-linux-x86_64.tar.xz' -P ~/.buildozer/android/ + tar -xf ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz -C ~/.buildozer/android/ + rm -rf ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9 + ln -s ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21 ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9 + cp -f $GITHUB_WORKSPACE/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle.arm $GITHUB_WORKSPACE/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle + cp -f $GITHUB_WORKSPACE/scripts/build-target-python.sh ~/.buildozer/android/crystax-ndk-10.3.2/build/tools/build-target-python.sh + cp -f $GITHUB_WORKSPACE/scripts/mangled-glibc-syscalls.h ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21/arch-arm/usr/include/crystax/bionic/libc/include/sys/mangled-glibc-syscalls.h + cp -f $GITHUB_WORKSPACE/scripts/build-binary.mk ~/.buildozer/android/crystax-ndk-10.3.2/build/core/build-binary.mk + rm -rf ~/.buildozer/android/crystax-ndk-10.3.2/sources/sqlite + cp -Rf $GITHUB_WORKSPACE/scripts/crystax-sources/sqlite ~/.buildozer/android/crystax-ndk-10.3.2/sources/sqlite + rm ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz + mv buildozer.spec.arm.ci buildozer.spec + chmod u+x ./build-release.sh + ./build-release.sh + cp $GITHUB_WORKSPACE/bin/lbrysdk-${{ env.BUILD_VERSION }}-armeabi-v7a-release.aar /dev/null + # deploy_build_lbry_io: + # runs-on: ubuntu-latest + # container: lbry/android-base:python39 + # needs: [build_arm64_aar, build_arm_aar] + # steps: + # - name: dependencies + # run: | + # pip install awscli + # export BUILD_VERSION=$(cat $GITHUB_WORKSPACE/src/main/python/main.py | grep --color=never -oP '([0-9]+\.?)+') + # export BUILD_APK_FILENAME__32=lbrysdk-$BUILD_VERSION-armeabi-v7a-release.aar + # export BUILD_APK_FILENAME__64=lbrysdk-$BUILD_VERSION-arm64-v8a-release.aar + # - name: upload + # run: | + # aws s3 cp bin/$BUILD_APK_FILENAME__64 s3://build.lbry.io/android/sdk-build-${CI_PIPELINE_IID}_commit-${CI_COMMIT_SHA:0:7}/$BUILD_APK_FILENAME__64 + # aws s3 cp bin/$BUILD_APK_FILENAME__32 s3://build.lbry.io/android/sdk-build-${CI_PIPELINE_IID}_commit-${CI_COMMIT_SHA:0:7}/$BUILD_APK_FILENAME__32 + # release_aar: + # runs-on: ubuntu-latest + # container: python:latest + # needs: [build_arm64_aar, build_arm_aar] + # steps: + # - name: dependencies + # run: | + # pip install awscli githubrelease + # export BUILD_VERSION=$(cat $GITHUB_WORKSPACE/src/main/python/main.py | grep --color=never -oP '([0-9]+\.?)+') + # export BUILD_APK_FILENAME__32=lbrysdk-$BUILD_VERSION-armeabi-v7a-release.aar + # export BUILD_APK_FILENAME__64=lbrysdk-$BUILD_VERSION-arm64-v8a-release.aar + # - name: release + # run: githubrelease release lbryio/lbry-android-sdk create $CI_COMMIT_TAG --publish bin/$BUILD_APK_FILENAME__64 bin/$BUILD_APK_FILENAME__32 diff --git a/signing2.pgp b/signing2.pgp new file mode 100644 index 0000000000000000000000000000000000000000..da549e4bf7093d30a2bfb1f3dc337e4e51d02f9a GIT binary patch literal 4932 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 literal 0 HcmV?d00001 From 9ec26cabcf921b67db95f4b9b1a1b0047afe8cff Mon Sep 17 00:00:00 2001 From: zeppi <jessopb@gmail.com> Date: Mon, 21 Nov 2022 10:17:06 -0500 Subject: [PATCH 02/17] wip --- .github/workflows/deploy.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 00b09d8..3881e6c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -15,7 +15,7 @@ jobs: - name: checkout uses: actions/checkout@v3 - name: export build version - run: echo "BUILD_VERSION"=$(cat $GITHUB_WORKSPACE/src/main/python/main.py | grep --color=never -oP '([0-9]+\.?)+')" >> $GITHUB_ENV + run: export BUILD_VERSION=$(cat $GITHUB_WORKSPACE/src/main/python/main.py | grep --color=never -oP '([0-9]+\.?)+') - name: build arm64 aar run: | echo "NEXUS_SIGNING_KEYRING_FILE=$GITHUB_WORKSPACE/signing2.pgp" >> $GITHUB_ENV @@ -32,6 +32,7 @@ jobs: rm ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz mv buildozer.spec.arm64.ci buildozer.spec chmod u+x ./build-release.sh + ls ~/.buildozer/android/ ./build-release.sh cp $GITHUB_WORKSPACE/bin/lbrysdk-${{ env.BUILD_VERSION }}-arm64-v8a-release.aar /dev/null build_arm_aar: From 57a5706fe7e96a1998ab3dc6328a4b0ec800451c Mon Sep 17 00:00:00 2001 From: zeppi <jessopb@gmail.com> Date: Mon, 21 Nov 2022 10:37:22 -0500 Subject: [PATCH 03/17] buildozer spec versions --- buildozer.spec.arm.ci | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildozer.spec.arm.ci b/buildozer.spec.arm.ci index aa666ed..b294e5a 100644 --- a/buildozer.spec.arm.ci +++ b/buildozer.spec.arm.ci @@ -101,7 +101,7 @@ android.minapi = 21 android.sdk = 23 # (str) Android NDK version to use -#android.ndk = 13b +#android.ndk = 17c # (bool) Use --private data storage (True) or --dir public storage (False) #android.private_storage = True From 641b1585b6a36901428ca91cef30860581389850 Mon Sep 17 00:00:00 2001 From: zeppi <jessopb@gmail.com> Date: Mon, 21 Nov 2022 12:22:20 -0500 Subject: [PATCH 04/17] accept license --- buildozer.spec.arm.ci | 1 + 1 file changed, 1 insertion(+) diff --git a/buildozer.spec.arm.ci b/buildozer.spec.arm.ci index b294e5a..295efea 100644 --- a/buildozer.spec.arm.ci +++ b/buildozer.spec.arm.ci @@ -275,3 +275,4 @@ warn_on_root = 1 # Then, invoke the command line with the "demo" profile: # #buildozer --profile demo android debug +android.accept_sdk_license = True \ No newline at end of file From c465a751866f644301d9272606aecd49197c81a4 Mon Sep 17 00:00:00 2001 From: zeppi <jessopb@gmail.com> Date: Mon, 21 Nov 2022 15:46:50 -0500 Subject: [PATCH 05/17] debugging --- .github/workflows/deploy.yml | 81 ++++++++++++++++++++++-------------- 1 file changed, 50 insertions(+), 31 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 3881e6c..6819e3a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -16,10 +16,11 @@ jobs: uses: actions/checkout@v3 - name: export build version run: export BUILD_VERSION=$(cat $GITHUB_WORKSPACE/src/main/python/main.py | grep --color=never -oP '([0-9]+\.?)+') - - name: build arm64 aar + - name: setup run: | echo "NEXUS_SIGNING_KEYRING_FILE=$GITHUB_WORKSPACE/signing2.pgp" >> $GITHUB_ENV export PATH=/usr/bin:$PATH + wget -q 'https://eu.crystax.net/download/crystax-ndk-10.3.2-linux-x86_64.tar.xz' -P ~/.buildozer/android/ tar -xf ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz -C ~/.buildozer/android/ rm -rf ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9 @@ -32,36 +33,54 @@ jobs: rm ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz mv buildozer.spec.arm64.ci buildozer.spec chmod u+x ./build-release.sh - ls ~/.buildozer/android/ - ./build-release.sh - cp $GITHUB_WORKSPACE/bin/lbrysdk-${{ env.BUILD_VERSION }}-arm64-v8a-release.aar /dev/null - build_arm_aar: - runs-on: ubuntu-latest - container: lbry/android-base:python39 - steps: - - name: checkout - uses: actions/checkout@v3 - - name: export build version - run: export BUILD_VERSION=$(cat $GITHUB_WORKSPACE/src/main/python/main.py | grep --color=never -oP '([0-9]+\.?)+') - - name: build arm aar - run: | - export NEXUS_SIGNING_KEYRING_FILE=$GITHUB_WORKSPACE/signing2.pgp - export PATH=/usr/bin:$PATH - wget -q 'https://eu.crystax.net/download/crystax-ndk-10.3.2-linux-x86_64.tar.xz' -P ~/.buildozer/android/ - tar -xf ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz -C ~/.buildozer/android/ - rm -rf ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9 - ln -s ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21 ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9 - cp -f $GITHUB_WORKSPACE/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle.arm $GITHUB_WORKSPACE/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle - cp -f $GITHUB_WORKSPACE/scripts/build-target-python.sh ~/.buildozer/android/crystax-ndk-10.3.2/build/tools/build-target-python.sh - cp -f $GITHUB_WORKSPACE/scripts/mangled-glibc-syscalls.h ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21/arch-arm/usr/include/crystax/bionic/libc/include/sys/mangled-glibc-syscalls.h - cp -f $GITHUB_WORKSPACE/scripts/build-binary.mk ~/.buildozer/android/crystax-ndk-10.3.2/build/core/build-binary.mk - rm -rf ~/.buildozer/android/crystax-ndk-10.3.2/sources/sqlite - cp -Rf $GITHUB_WORKSPACE/scripts/crystax-sources/sqlite ~/.buildozer/android/crystax-ndk-10.3.2/sources/sqlite - rm ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz - mv buildozer.spec.arm.ci buildozer.spec - chmod u+x ./build-release.sh - ./build-release.sh - cp $GITHUB_WORKSPACE/bin/lbrysdk-${{ env.BUILD_VERSION }}-armeabi-v7a-release.aar /dev/null + - name: debug + run: pwd && ls -al + # - name: build arm64 aar + # run: | + # echo "NEXUS_SIGNING_KEYRING_FILE=$GITHUB_WORKSPACE/signing2.pgp" >> $GITHUB_ENV + # export PATH=/usr/bin:$PATH + + # wget -q 'https://eu.crystax.net/download/crystax-ndk-10.3.2-linux-x86_64.tar.xz' -P ~/.buildozer/android/ + # tar -xf ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz -C ~/.buildozer/android/ + # rm -rf ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9 + # ln -s ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21 ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9 + # cp -f $GITHUB_WORKSPACE/scripts/build-target-python.sh ~/.buildozer/android/crystax-ndk-10.3.2/build/tools/build-target-python.sh + # cp -f $GITHUB_WORKSPACE/scripts/mangled-glibc-syscalls__arm64.h ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21/arch-arm64/usr/include/crystax/bionic/libc/include/sys/mangled-glibc-syscalls.h + # cp -f $GITHUB_WORKSPACE/scripts/build-binary.mk ~/.buildozer/android/crystax-ndk-10.3.2/build/core/build-binary.mk + # rm -rf ~/.buildozer/android/crystax-ndk-10.3.2/sources/sqlite + # cp -Rf $GITHUB_WORKSPACE/scripts/crystax-sources/sqlite ~/.buildozer/android/crystax-ndk-10.3.2/sources/sqlite + # rm ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz + # mv buildozer.spec.arm64.ci buildozer.spec + # chmod u+x ./build-release.sh + # ./build-release.sh + # cp $GITHUB_WORKSPACE/bin/lbrysdk-${{ env.BUILD_VERSION }}-arm64-v8a-release.aar /dev/null + # build_arm_aar: + # runs-on: ubuntu-latest + # container: lbry/android-base:python39 + # steps: + # - name: checkout + # uses: actions/checkout@v3 + # - name: export build version + # run: export BUILD_VERSION=$(cat $GITHUB_WORKSPACE/src/main/python/main.py | grep --color=never -oP '([0-9]+\.?)+') + # - name: build arm aar + # run: | + # export NEXUS_SIGNING_KEYRING_FILE=$GITHUB_WORKSPACE/signing2.pgp + # export PATH=/usr/bin:$PATH + # wget -q 'https://eu.crystax.net/download/crystax-ndk-10.3.2-linux-x86_64.tar.xz' -P ~/.buildozer/android/ + # tar -xf ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz -C ~/.buildozer/android/ + # rm -rf ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9 + # ln -s ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21 ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9 + # cp -f $GITHUB_WORKSPACE/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle.arm $GITHUB_WORKSPACE/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle + # cp -f $GITHUB_WORKSPACE/scripts/build-target-python.sh ~/.buildozer/android/crystax-ndk-10.3.2/build/tools/build-target-python.sh + # cp -f $GITHUB_WORKSPACE/scripts/mangled-glibc-syscalls.h ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21/arch-arm/usr/include/crystax/bionic/libc/include/sys/mangled-glibc-syscalls.h + # cp -f $GITHUB_WORKSPACE/scripts/build-binary.mk ~/.buildozer/android/crystax-ndk-10.3.2/build/core/build-binary.mk + # rm -rf ~/.buildozer/android/crystax-ndk-10.3.2/sources/sqlite + # cp -Rf $GITHUB_WORKSPACE/scripts/crystax-sources/sqlite ~/.buildozer/android/crystax-ndk-10.3.2/sources/sqlite + # rm ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz + # mv buildozer.spec.arm.ci buildozer.spec + # chmod u+x ./build-release.sh + # ./build-release.sh + # cp $GITHUB_WORKSPACE/bin/lbrysdk-${{ env.BUILD_VERSION }}-armeabi-v7a-release.aar /dev/null # deploy_build_lbry_io: # runs-on: ubuntu-latest # container: lbry/android-base:python39 From 2f0d159c2fa6b3bf6f59537216c5fc625f59854f Mon Sep 17 00:00:00 2001 From: zeppi <jessopb@gmail.com> Date: Mon, 21 Nov 2022 16:02:09 -0500 Subject: [PATCH 06/17] buildozer setup --- .github/workflows/deploy.yml | 72 +++++++++++++++++++++++++----------- 1 file changed, 50 insertions(+), 22 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 6819e3a..1d2e7c3 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -10,13 +10,60 @@ on: jobs: build_arm64_aar: runs-on: ubuntu-latest - container: lbry/android-base:python39 + # container: lbry/android-base:python39 steps: - name: checkout uses: actions/checkout@v3 - name: export build version run: export BUILD_VERSION=$(cat $GITHUB_WORKSPACE/src/main/python/main.py | grep --color=never -oP '([0-9]+\.?)+') - name: setup + run: | + export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 + dpkg --add-architecture i386 + apt-get -y update && apt-get -y install curl ca-certificates software-properties-common gpg-agent wget + add-apt-repository ppa:deadsnakes/ppa -y + apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install autoconf autogen automake \ + libtool libffi-dev build-essential python3.9 python3.9-dev python3.9-venv ccache git \ + libncurses5:i386 libstdc++6:i386 libgtk2.0-0:i386 libpangox-1.0-0:i386 libpangoxft-1.0-0:i386 \ + libidn11:i386 openjdk-8-jdk unzip zlib1g-dev zlib1g:i386 m4 libc6-dev-i386 gawk + + rm /usr/bin/python3 && ln -s /usr/bin/python3.9 /usr/bin/python3 + rm -f /usr/bin/python && ln -s /usr/bin/python3.9 /usr/bin/python + wget https://bootstrap.pypa.io/pip/get-pip.py && python3 get-pip.py + pip install --upgrade cython==0.29.24 setuptools zipp importlib-resources importlib-metadata virtualenv appdirs sh colorama\>=0.3.3 jinja2 six pep517\<0.7.0 toml + + mkdir -p cd ~/.buildozer/android/platform/ + + wget 'https://dl.google.com/android/android-sdk_r23-linux.tgz' -P ~/.buildozer/android/platform/ && \ + wget 'https://dl.google.com/android/repository/platform-28_r06.zip' -P ~/.buildozer/android/platform/ && \ + wget 'https://dl.google.com/android/repository/build-tools_r28.0.3-linux.zip' -P ~/.buildozer/android/platform/ && \ + wget 'https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip' -P ~/.buildozer/android/platform + + tar -xvf ~/.buildozer/android/platform/android-sdk_r23-linux.tgz -C ~/.buildozer/android/platform/ && \ + mv ~/.buildozer/android/platform/android-sdk-linux ~/.buildozer/android/platform/android-sdk && \ + unzip ~/.buildozer/android/platform/platform-28_r06.zip -d ~/.buildozer/android/platform/android-sdk/platforms && \ + mv ~/.buildozer/android/platform/android-sdk/platforms/android-9 ~/.buildozer/android/platform/android-sdk/platforms/android-28 && \ + mkdir -p ~/.buildozer/android/platform/android-sdk/build-tools && \ + unzip ~/.buildozer/android/platform/build-tools_r28.0.3-linux.zip -d ~/.buildozer/android/platform/android-sdk/build-tools && \ + mv ~/.buildozer/android/platform/android-sdk/build-tools/android-9 ~/.buildozer/android/platform/android-sdk/build-tools/28.0.3 && \ + mkdir -p ~/.buildozer/android/platform/android-sdk/cmdline-tools && \ + unzip ~/.buildozer/android/platform/commandlinetools-linux-7583922_latest.zip -d ~/.buildozer/android/platform/android-sdk/cmdline-tools && \ + mv ~/.buildozer/android/platform/android-sdk/cmdline-tools/cmdline-tools ~/.buildozer/android/platform/android-sdk/cmdline-tools/5.0 && \ + cp -Rf ~/.buildozer/android/platform/android-sdk/cmdline-tools/5.0/* ~/.buildozer/android/platform/android-sdk/tools + + rm ~/.buildozer/android/platform/android-sdk_r23-linux.tgz && \ + rm ~/.buildozer/android/platform/platform-28_r06.zip && \ + rm ~/.buildozer/android/platform/build-tools_r28.0.3-linux.zip && \ + rm ~/.buildozer/android/platform/commandlinetools-linux-7583922_latest.zip + + mkdir -p ~/.buildozer/android/platform/android-sdk/licenses && \ + echo $'\n8933bad161af4178b1185d1a37fbf41ea5269c55\nd56f5187479451eabf01fb78af6dfcb131a6481e\n24333f8a63b6825ea9c5514f83c2829b004d1fee' > ~/.buildozer/android/platform/android-sdk/licenses/android-sdk-license + + git clone https://github.com/lbryio/buildozer.git + cd buildozer && python setup.py install && cd .. + - name: debug + run: pwd && ls -al + - name: build arm64 aar run: | echo "NEXUS_SIGNING_KEYRING_FILE=$GITHUB_WORKSPACE/signing2.pgp" >> $GITHUB_ENV export PATH=/usr/bin:$PATH @@ -33,27 +80,8 @@ jobs: rm ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz mv buildozer.spec.arm64.ci buildozer.spec chmod u+x ./build-release.sh - - name: debug - run: pwd && ls -al - # - name: build arm64 aar - # run: | - # echo "NEXUS_SIGNING_KEYRING_FILE=$GITHUB_WORKSPACE/signing2.pgp" >> $GITHUB_ENV - # export PATH=/usr/bin:$PATH - - # wget -q 'https://eu.crystax.net/download/crystax-ndk-10.3.2-linux-x86_64.tar.xz' -P ~/.buildozer/android/ - # tar -xf ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz -C ~/.buildozer/android/ - # rm -rf ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9 - # ln -s ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21 ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9 - # cp -f $GITHUB_WORKSPACE/scripts/build-target-python.sh ~/.buildozer/android/crystax-ndk-10.3.2/build/tools/build-target-python.sh - # cp -f $GITHUB_WORKSPACE/scripts/mangled-glibc-syscalls__arm64.h ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21/arch-arm64/usr/include/crystax/bionic/libc/include/sys/mangled-glibc-syscalls.h - # cp -f $GITHUB_WORKSPACE/scripts/build-binary.mk ~/.buildozer/android/crystax-ndk-10.3.2/build/core/build-binary.mk - # rm -rf ~/.buildozer/android/crystax-ndk-10.3.2/sources/sqlite - # cp -Rf $GITHUB_WORKSPACE/scripts/crystax-sources/sqlite ~/.buildozer/android/crystax-ndk-10.3.2/sources/sqlite - # rm ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz - # mv buildozer.spec.arm64.ci buildozer.spec - # chmod u+x ./build-release.sh - # ./build-release.sh - # cp $GITHUB_WORKSPACE/bin/lbrysdk-${{ env.BUILD_VERSION }}-arm64-v8a-release.aar /dev/null + ./build-release.sh + cp $GITHUB_WORKSPACE/bin/lbrysdk-${{ env.BUILD_VERSION }}-arm64-v8a-release.aar /dev/null # build_arm_aar: # runs-on: ubuntu-latest # container: lbry/android-base:python39 From 732d2ce78c36643c10e11b45496a6fb1109a4e79 Mon Sep 17 00:00:00 2001 From: zeppi <jessopb@gmail.com> Date: Mon, 21 Nov 2022 16:35:28 -0500 Subject: [PATCH 07/17] test --- .github/workflows/deploy.yml | 106 ++++++++++++++--------------------- 1 file changed, 41 insertions(+), 65 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 1d2e7c3..b5b0011 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -10,78 +10,54 @@ on: jobs: build_arm64_aar: runs-on: ubuntu-latest - # container: lbry/android-base:python39 + container: lbry/android-base:python39 steps: - name: checkout uses: actions/checkout@v3 + - name: Log the buildozer version + run: | + ls -al + - name: export build version run: export BUILD_VERSION=$(cat $GITHUB_WORKSPACE/src/main/python/main.py | grep --color=never -oP '([0-9]+\.?)+') - - name: setup - run: | - export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 - dpkg --add-architecture i386 - apt-get -y update && apt-get -y install curl ca-certificates software-properties-common gpg-agent wget - add-apt-repository ppa:deadsnakes/ppa -y - apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install autoconf autogen automake \ - libtool libffi-dev build-essential python3.9 python3.9-dev python3.9-venv ccache git \ - libncurses5:i386 libstdc++6:i386 libgtk2.0-0:i386 libpangox-1.0-0:i386 libpangoxft-1.0-0:i386 \ - libidn11:i386 openjdk-8-jdk unzip zlib1g-dev zlib1g:i386 m4 libc6-dev-i386 gawk + # - name: setup + # run: | + # echo "NEXUS_SIGNING_KEYRING_FILE=$GITHUB_WORKSPACE/signing2.pgp" >> $GITHUB_ENV + # export PATH=/usr/bin:$PATH - rm /usr/bin/python3 && ln -s /usr/bin/python3.9 /usr/bin/python3 - rm -f /usr/bin/python && ln -s /usr/bin/python3.9 /usr/bin/python - wget https://bootstrap.pypa.io/pip/get-pip.py && python3 get-pip.py - pip install --upgrade cython==0.29.24 setuptools zipp importlib-resources importlib-metadata virtualenv appdirs sh colorama\>=0.3.3 jinja2 six pep517\<0.7.0 toml + # wget -q 'https://eu.crystax.net/download/crystax-ndk-10.3.2-linux-x86_64.tar.xz' -P ~/.buildozer/android/ + # tar -xf ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz -C ~/.buildozer/android/ + # rm -rf ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9 + # ln -s ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21 ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9 + # cp -f $GITHUB_WORKSPACE/scripts/build-target-python.sh ~/.buildozer/android/crystax-ndk-10.3.2/build/tools/build-target-python.sh + # cp -f $GITHUB_WORKSPACE/scripts/mangled-glibc-syscalls__arm64.h ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21/arch-arm64/usr/include/crystax/bionic/libc/include/sys/mangled-glibc-syscalls.h + # cp -f $GITHUB_WORKSPACE/scripts/build-binary.mk ~/.buildozer/android/crystax-ndk-10.3.2/build/core/build-binary.mk + # rm -rf ~/.buildozer/android/crystax-ndk-10.3.2/sources/sqlite + # cp -Rf $GITHUB_WORKSPACE/scripts/crystax-sources/sqlite ~/.buildozer/android/crystax-ndk-10.3.2/sources/sqlite + # rm ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz + # mv buildozer.spec.arm64.ci buildozer.spec + # chmod u+x ./build-release.sh + # - name: debug + # run: pwd && ls -al + # - name: build arm64 aar + # run: | + # echo "NEXUS_SIGNING_KEYRING_FILE=$GITHUB_WORKSPACE/signing2.pgp" >> $GITHUB_ENV + # export PATH=/usr/bin:$PATH - mkdir -p cd ~/.buildozer/android/platform/ - - wget 'https://dl.google.com/android/android-sdk_r23-linux.tgz' -P ~/.buildozer/android/platform/ && \ - wget 'https://dl.google.com/android/repository/platform-28_r06.zip' -P ~/.buildozer/android/platform/ && \ - wget 'https://dl.google.com/android/repository/build-tools_r28.0.3-linux.zip' -P ~/.buildozer/android/platform/ && \ - wget 'https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip' -P ~/.buildozer/android/platform - - tar -xvf ~/.buildozer/android/platform/android-sdk_r23-linux.tgz -C ~/.buildozer/android/platform/ && \ - mv ~/.buildozer/android/platform/android-sdk-linux ~/.buildozer/android/platform/android-sdk && \ - unzip ~/.buildozer/android/platform/platform-28_r06.zip -d ~/.buildozer/android/platform/android-sdk/platforms && \ - mv ~/.buildozer/android/platform/android-sdk/platforms/android-9 ~/.buildozer/android/platform/android-sdk/platforms/android-28 && \ - mkdir -p ~/.buildozer/android/platform/android-sdk/build-tools && \ - unzip ~/.buildozer/android/platform/build-tools_r28.0.3-linux.zip -d ~/.buildozer/android/platform/android-sdk/build-tools && \ - mv ~/.buildozer/android/platform/android-sdk/build-tools/android-9 ~/.buildozer/android/platform/android-sdk/build-tools/28.0.3 && \ - mkdir -p ~/.buildozer/android/platform/android-sdk/cmdline-tools && \ - unzip ~/.buildozer/android/platform/commandlinetools-linux-7583922_latest.zip -d ~/.buildozer/android/platform/android-sdk/cmdline-tools && \ - mv ~/.buildozer/android/platform/android-sdk/cmdline-tools/cmdline-tools ~/.buildozer/android/platform/android-sdk/cmdline-tools/5.0 && \ - cp -Rf ~/.buildozer/android/platform/android-sdk/cmdline-tools/5.0/* ~/.buildozer/android/platform/android-sdk/tools - - rm ~/.buildozer/android/platform/android-sdk_r23-linux.tgz && \ - rm ~/.buildozer/android/platform/platform-28_r06.zip && \ - rm ~/.buildozer/android/platform/build-tools_r28.0.3-linux.zip && \ - rm ~/.buildozer/android/platform/commandlinetools-linux-7583922_latest.zip - - mkdir -p ~/.buildozer/android/platform/android-sdk/licenses && \ - echo $'\n8933bad161af4178b1185d1a37fbf41ea5269c55\nd56f5187479451eabf01fb78af6dfcb131a6481e\n24333f8a63b6825ea9c5514f83c2829b004d1fee' > ~/.buildozer/android/platform/android-sdk/licenses/android-sdk-license - - git clone https://github.com/lbryio/buildozer.git - cd buildozer && python setup.py install && cd .. - - name: debug - run: pwd && ls -al - - name: build arm64 aar - run: | - echo "NEXUS_SIGNING_KEYRING_FILE=$GITHUB_WORKSPACE/signing2.pgp" >> $GITHUB_ENV - export PATH=/usr/bin:$PATH - - wget -q 'https://eu.crystax.net/download/crystax-ndk-10.3.2-linux-x86_64.tar.xz' -P ~/.buildozer/android/ - tar -xf ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz -C ~/.buildozer/android/ - rm -rf ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9 - ln -s ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21 ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9 - cp -f $GITHUB_WORKSPACE/scripts/build-target-python.sh ~/.buildozer/android/crystax-ndk-10.3.2/build/tools/build-target-python.sh - cp -f $GITHUB_WORKSPACE/scripts/mangled-glibc-syscalls__arm64.h ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21/arch-arm64/usr/include/crystax/bionic/libc/include/sys/mangled-glibc-syscalls.h - cp -f $GITHUB_WORKSPACE/scripts/build-binary.mk ~/.buildozer/android/crystax-ndk-10.3.2/build/core/build-binary.mk - rm -rf ~/.buildozer/android/crystax-ndk-10.3.2/sources/sqlite - cp -Rf $GITHUB_WORKSPACE/scripts/crystax-sources/sqlite ~/.buildozer/android/crystax-ndk-10.3.2/sources/sqlite - rm ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz - mv buildozer.spec.arm64.ci buildozer.spec - chmod u+x ./build-release.sh - ./build-release.sh - cp $GITHUB_WORKSPACE/bin/lbrysdk-${{ env.BUILD_VERSION }}-arm64-v8a-release.aar /dev/null + # wget -q 'https://eu.crystax.net/download/crystax-ndk-10.3.2-linux-x86_64.tar.xz' -P ~/.buildozer/android/ + # tar -xf ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz -C ~/.buildozer/android/ + # rm -rf ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9 + # ln -s ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21 ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9 + # cp -f $GITHUB_WORKSPACE/scripts/build-target-python.sh ~/.buildozer/android/crystax-ndk-10.3.2/build/tools/build-target-python.sh + # cp -f $GITHUB_WORKSPACE/scripts/mangled-glibc-syscalls__arm64.h ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21/arch-arm64/usr/include/crystax/bionic/libc/include/sys/mangled-glibc-syscalls.h + # cp -f $GITHUB_WORKSPACE/scripts/build-binary.mk ~/.buildozer/android/crystax-ndk-10.3.2/build/core/build-binary.mk + # rm -rf ~/.buildozer/android/crystax-ndk-10.3.2/sources/sqlite + # cp -Rf $GITHUB_WORKSPACE/scripts/crystax-sources/sqlite ~/.buildozer/android/crystax-ndk-10.3.2/sources/sqlite + # rm ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz + # mv buildozer.spec.arm64.ci buildozer.spec + # chmod u+x ./build-release.sh + # ./build-release.sh + # cp $GITHUB_WORKSPACE/bin/lbrysdk-${{ env.BUILD_VERSION }}-arm64-v8a-release.aar /dev/null # build_arm_aar: # runs-on: ubuntu-latest # container: lbry/android-base:python39 From 5bb7d6b60705cd1e6323ae47c0f9bd758fe57fa5 Mon Sep 17 00:00:00 2001 From: zeppi <jessopb@gmail.com> Date: Mon, 21 Nov 2022 16:38:10 -0500 Subject: [PATCH 08/17] test --- .github/workflows/deploy.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b5b0011..95f6664 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -17,7 +17,6 @@ jobs: - name: Log the buildozer version run: | ls -al - - name: export build version run: export BUILD_VERSION=$(cat $GITHUB_WORKSPACE/src/main/python/main.py | grep --color=never -oP '([0-9]+\.?)+') # - name: setup From f9a446375052855660a245700a7eb412872d2e13 Mon Sep 17 00:00:00 2001 From: zeppi <jessopb@gmail.com> Date: Mon, 21 Nov 2022 16:41:14 -0500 Subject: [PATCH 09/17] test --- .github/workflows/deploy.yml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 95f6664..7c154d5 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -19,25 +19,25 @@ jobs: ls -al - name: export build version run: export BUILD_VERSION=$(cat $GITHUB_WORKSPACE/src/main/python/main.py | grep --color=never -oP '([0-9]+\.?)+') - # - name: setup - # run: | - # echo "NEXUS_SIGNING_KEYRING_FILE=$GITHUB_WORKSPACE/signing2.pgp" >> $GITHUB_ENV - # export PATH=/usr/bin:$PATH + - name: setup + run: | + echo "NEXUS_SIGNING_KEYRING_FILE=$GITHUB_WORKSPACE/signing2.pgp" >> $GITHUB_ENV + export PATH=/usr/bin:$PATH - # wget -q 'https://eu.crystax.net/download/crystax-ndk-10.3.2-linux-x86_64.tar.xz' -P ~/.buildozer/android/ - # tar -xf ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz -C ~/.buildozer/android/ - # rm -rf ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9 - # ln -s ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21 ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9 - # cp -f $GITHUB_WORKSPACE/scripts/build-target-python.sh ~/.buildozer/android/crystax-ndk-10.3.2/build/tools/build-target-python.sh - # cp -f $GITHUB_WORKSPACE/scripts/mangled-glibc-syscalls__arm64.h ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21/arch-arm64/usr/include/crystax/bionic/libc/include/sys/mangled-glibc-syscalls.h - # cp -f $GITHUB_WORKSPACE/scripts/build-binary.mk ~/.buildozer/android/crystax-ndk-10.3.2/build/core/build-binary.mk - # rm -rf ~/.buildozer/android/crystax-ndk-10.3.2/sources/sqlite - # cp -Rf $GITHUB_WORKSPACE/scripts/crystax-sources/sqlite ~/.buildozer/android/crystax-ndk-10.3.2/sources/sqlite - # rm ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz - # mv buildozer.spec.arm64.ci buildozer.spec - # chmod u+x ./build-release.sh - # - name: debug - # run: pwd && ls -al + wget -q 'https://eu.crystax.net/download/crystax-ndk-10.3.2-linux-x86_64.tar.xz' -P ~/.buildozer/android/ + tar -xf ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz -C ~/.buildozer/android/ + rm -rf ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9 + ln -s ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21 ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9 + cp -f $GITHUB_WORKSPACE/scripts/build-target-python.sh ~/.buildozer/android/crystax-ndk-10.3.2/build/tools/build-target-python.sh + cp -f $GITHUB_WORKSPACE/scripts/mangled-glibc-syscalls__arm64.h ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21/arch-arm64/usr/include/crystax/bionic/libc/include/sys/mangled-glibc-syscalls.h + cp -f $GITHUB_WORKSPACE/scripts/build-binary.mk ~/.buildozer/android/crystax-ndk-10.3.2/build/core/build-binary.mk + rm -rf ~/.buildozer/android/crystax-ndk-10.3.2/sources/sqlite + cp -Rf $GITHUB_WORKSPACE/scripts/crystax-sources/sqlite ~/.buildozer/android/crystax-ndk-10.3.2/sources/sqlite + rm ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz + mv buildozer.spec.arm64.ci buildozer.spec + chmod u+x ./build-release.sh + - name: debug + run: pwd && ls -al # - name: build arm64 aar # run: | # echo "NEXUS_SIGNING_KEYRING_FILE=$GITHUB_WORKSPACE/signing2.pgp" >> $GITHUB_ENV From 2053dbc909dba0d5f4c72c2d22a39e4df1d47a26 Mon Sep 17 00:00:00 2001 From: zeppi <jessopb@gmail.com> Date: Mon, 21 Nov 2022 16:46:26 -0500 Subject: [PATCH 10/17] test --- .github/workflows/deploy.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 7c154d5..32c4794 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -17,6 +17,8 @@ jobs: - name: Log the buildozer version run: | ls -al + ls -al ~/ + ls -al $GITHUB_WORKSPACE - name: export build version run: export BUILD_VERSION=$(cat $GITHUB_WORKSPACE/src/main/python/main.py | grep --color=never -oP '([0-9]+\.?)+') - name: setup From e24bb034246f3aa470ebd38822093b4f8584a131 Mon Sep 17 00:00:00 2001 From: zeppi <jessopb@gmail.com> Date: Mon, 21 Nov 2022 16:54:11 -0500 Subject: [PATCH 11/17] test --- .github/workflows/deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 32c4794..5c1ada4 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -19,6 +19,7 @@ jobs: ls -al ls -al ~/ ls -al $GITHUB_WORKSPACE + pwd - name: export build version run: export BUILD_VERSION=$(cat $GITHUB_WORKSPACE/src/main/python/main.py | grep --color=never -oP '([0-9]+\.?)+') - name: setup From 889960ffddecf28e61eac30cab9c45e06d2c3791 Mon Sep 17 00:00:00 2001 From: zeppi <jessopb@gmail.com> Date: Mon, 21 Nov 2022 16:57:45 -0500 Subject: [PATCH 12/17] test --- .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 5c1ada4..858b86b 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -17,7 +17,7 @@ jobs: - name: Log the buildozer version run: | ls -al - ls -al ~/ + ls -al ~/.buildozer ls -al $GITHUB_WORKSPACE pwd - name: export build version @@ -39,8 +39,8 @@ jobs: rm ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz mv buildozer.spec.arm64.ci buildozer.spec chmod u+x ./build-release.sh - - name: debug - run: pwd && ls -al + - name: build release + run: ./build-release.sh # - name: build arm64 aar # run: | # echo "NEXUS_SIGNING_KEYRING_FILE=$GITHUB_WORKSPACE/signing2.pgp" >> $GITHUB_ENV From c8799d5a20ef846a5400d1677b50d2ae6062ca42 Mon Sep 17 00:00:00 2001 From: zeppi <jessopb@gmail.com> Date: Mon, 21 Nov 2022 17:01:11 -0500 Subject: [PATCH 13/17] test --- .github/workflows/deploy.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 858b86b..2a650a9 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -16,9 +16,6 @@ jobs: uses: actions/checkout@v3 - name: Log the buildozer version run: | - ls -al - ls -al ~/.buildozer - ls -al $GITHUB_WORKSPACE pwd - name: export build version run: export BUILD_VERSION=$(cat $GITHUB_WORKSPACE/src/main/python/main.py | grep --color=never -oP '([0-9]+\.?)+') From 564f1a3193242cfd35fdd13cc70717df4dd07ee2 Mon Sep 17 00:00:00 2001 From: zeppi <jessopb@gmail.com> Date: Mon, 21 Nov 2022 18:30:20 -0500 Subject: [PATCH 14/17] try hacky copy --- .github/workflows/deploy.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 2a650a9..5992b61 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -14,9 +14,13 @@ jobs: steps: - name: checkout uses: actions/checkout@v3 + - name: hacky copy + run: | + cp -r /root/.buildozer ~/.buildozer/ - name: Log the buildozer version run: | pwd + ls -al / - name: export build version run: export BUILD_VERSION=$(cat $GITHUB_WORKSPACE/src/main/python/main.py | grep --color=never -oP '([0-9]+\.?)+') - name: setup From e5ed4443f7d4661dc569c3e351a1d8c260c1615e Mon Sep 17 00:00:00 2001 From: zeppi <jessopb@gmail.com> Date: Tue, 22 Nov 2022 08:37:59 -0500 Subject: [PATCH 15/17] try with env --- .github/workflows/deploy.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5992b61..3756ae8 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -41,6 +41,12 @@ jobs: mv buildozer.spec.arm64.ci buildozer.spec chmod u+x ./build-release.sh - name: build release + env: + SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} + SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} + SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }} + NEXUS_SIGNING_KEY_PASSWORD: ${{ secrets.NEXUS_SIGNING_KEY_PASSWORD }} + NEXUS_SIGNING_KEY_ID: ${{ secrets.NEXUS_SIGNING_KEY_ID }} run: ./build-release.sh # - name: build arm64 aar # run: | From f5daaee8206e96cabc091930b79c632bf51426b9 Mon Sep 17 00:00:00 2001 From: zeppi <jessopb@gmail.com> Date: Tue, 22 Nov 2022 09:58:04 -0500 Subject: [PATCH 16/17] hardcode profileid --- .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 3756ae8..dd98d66 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -14,7 +14,7 @@ jobs: steps: - name: checkout uses: actions/checkout@v3 - - name: hacky copy + - name: hacky copy # docker image runs ~ as /root, but github actions uses ~=/github/home run: | cp -r /root/.buildozer ~/.buildozer/ - name: Log the buildozer version @@ -44,7 +44,7 @@ jobs: env: SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} - SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }} + SONATYPE_STAGING_PROFILE_ID: io.lbry NEXUS_SIGNING_KEY_PASSWORD: ${{ secrets.NEXUS_SIGNING_KEY_PASSWORD }} NEXUS_SIGNING_KEY_ID: ${{ secrets.NEXUS_SIGNING_KEY_ID }} run: ./build-release.sh From ba46dda760bfab4b085f74954a64700ccf29ef07 Mon Sep 17 00:00:00 2001 From: zeppi <jessopb@gmail.com> Date: Tue, 22 Nov 2022 10:09:27 -0500 Subject: [PATCH 17/17] update staging profile id --- .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 dd98d66..449c13f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -44,7 +44,7 @@ jobs: env: SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} - SONATYPE_STAGING_PROFILE_ID: io.lbry + SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }} NEXUS_SIGNING_KEY_PASSWORD: ${{ secrets.NEXUS_SIGNING_KEY_PASSWORD }} NEXUS_SIGNING_KEY_ID: ${{ secrets.NEXUS_SIGNING_KEY_ID }} run: ./build-release.sh