From a7b04d66b6f769532528f0bc6b1cac97f9a858fe Mon Sep 17 00:00:00 2001 From: Brayo Date: Thu, 18 Jul 2024 20:15:13 +0300 Subject: [PATCH 1/6] chore: add 'sh' to README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bbb6201..ee19819 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ If you haven't already, initialize the submodules with: `git submodule update -- To build aw-server-rust you need to have Rust nightly installed (with rustup). Then you can build it with: -``` +```sh export ANDROID_NDK_HOME=`pwd`/aw-server-rust/NDK # The path to your NDK pushd aw-server-rust && ./install-ndk.sh; popd # This configures the NDK for use with Rust, and installs the NDK if missing env RELEASE=false make aw-server-rust # Set RELEASE=true to build in release mode (slower build, harder to debug) From b93ed9e44910f029a362b6daa6e5bbfc563b12bd Mon Sep 17 00:00:00 2001 From: Brayo Date: Thu, 18 Jul 2024 19:32:26 +0300 Subject: [PATCH 2/6] feat: update deprecated magick command --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e1648c5..d264c60 100644 --- a/Makefile +++ b/Makefile @@ -210,4 +210,4 @@ clean: .PHONY: fastlane/metadata/android/en-US/images/icon.png fastlane/metadata/android/en-US/images/icon.png: aw-server-rust/aw-webui/media/logo/logo.png - convert $< -resize 75% -gravity center -background white -extent 512x512 $@ + magick $< -resize 75% -gravity center -background white -extent 512x512 $@ From e6b3c514fb547172c5522a27a84fa154fd0612da Mon Sep 17 00:00:00 2001 From: Brayo Date: Mon, 22 Jul 2024 10:18:02 +0300 Subject: [PATCH 3/6] ci: separate fastlane code from build code --- .github/workflows/build-only.yml | 200 +++++++++++++++++++++++++++++++ 1 file changed, 200 insertions(+) create mode 100644 .github/workflows/build-only.yml diff --git a/.github/workflows/build-only.yml b/.github/workflows/build-only.yml new file mode 100644 index 0000000..bbcc778 --- /dev/null +++ b/.github/workflows/build-only.yml @@ -0,0 +1,200 @@ +name: "Build only" + +on: + push: + branches: [ master ] + tags: + - v* + pull_request: + branches: [ master ] + + +env: + NDK_VERSION: '25.2.9519653' + NODE_VERSION: '16' + JAVA_VERSION: '17' + +jobs: + build-rust: + name: Build aw-server-rust + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + submodules: 'recursive' + - name: Set RELEASE + run: | + echo "RELEASE=${{ startsWith(github.ref_name, 'v') }}" >> $GITHUB_ENV + + - name: Cache JNI libs + uses: actions/cache@v3 + id: cache-jniLibs + env: + cache-name: jniLibs + with: + path: mobile/src/main/jniLibs/ + key: ${{ env.cache-name }}-release-${{ env.RELEASE }}-ndk-${{ env.NDK_VERSION }}-${{ hashFiles('.git/modules/aw-server-rust/HEAD') }} + + - name: Display structure of downloaded files + if: steps.cache-jniLibs.outputs.cache-hit == 'true' + run: | + pushd mobile/src/main/jniLibs && ls -R && popd + + # Android SDK & NDK + - name: Set up Android SDK + if: steps.cache-jniLibs.outputs.cache-hit != 'true' + uses: android-actions/setup-android@v2 + - name: Set up Android NDK + if: steps.cache-jniLibs.outputs.cache-hit != 'true' + run: | + sdkmanager "ndk;${{ env.NDK_VERSION }}" + ANDROID_NDK_HOME="$ANDROID_SDK_ROOT/ndk/${{ env.NDK_VERSION }}" + ls $ANDROID_NDK_HOME + echo "ANDROID_NDK_HOME=$ANDROID_NDK_HOME" >> $GITHUB_ENV + + # Rust + - name: Set up Rust + id: toolchain + uses: dtolnay/rust-toolchain@stable + if: steps.cache-jniLibs.outputs.cache-hit != 'true' + + - name: Set up Rust toolchain for Android NDK + if: steps.cache-jniLibs.outputs.cache-hit != 'true' + run: | + ./aw-server-rust/install-ndk.sh + + - name: Cache cargo build + uses: actions/cache@v3 + if: steps.cache-jniLibs.outputs.cache-hit != 'true' + env: + cache-name: cargo-build-target + with: + path: aw-server-rust/target + # key needs to contain cachekey due to https://github.com/ActivityWatch/aw-server-rust/issues/180 + key: ${{ env.cache-name }}-${{ runner.os }}-release-${{ env.RELEASE }}-${{ steps.toolchain.outputs.cachekey }}-${{ hashFiles('**/Cargo.lock') }} + restore-keys: | + ${{ env.cache-name }}-${{ runner.os }}-release-${{ env.RELEASE }}-${{ steps.toolchain.outputs.cachekey }}- + + - name: Build aw-server-rust + if: steps.cache-jniLibs.outputs.cache-hit != 'true' + run: | + make aw-server-rust + + - name: Check that jniLibs present + run: | + test -e mobile/src/main/jniLibs/x86_64/libaw_server.so + + # This needs to be a seperate job since fastlane update_version, + # fails if run concurrently (such as in build apk/aab matrix), + # thus we need to run it once and and reuse the results. + # https://github.com/fastlane/fastlane/issues/13689#issuecomment-439217502 + get-versionCode: + name: Get latest versionCode + runs-on: ubuntu-latest + outputs: + versionCode: ${{ steps.versionCode.outputs.versionCode }} + + steps: + - uses: actions/checkout@v2 + with: + submodules: 'recursive' + + - name: Output versionCode + id: versionCode + run: | + cat mobile/build.gradle | grep versionCode | sed 's/.*\s\([0-9]*\)$/versionCode=\1/' >> "$GITHUB_OUTPUT" + + build-apk: + name: Build ${{ matrix.type }} + runs-on: ubuntu-20.04 + needs: [build-rust, get-versionCode] + strategy: + fail-fast: true + matrix: + type: ['apk', 'aab'] + + steps: + - uses: actions/checkout@v2 + with: + submodules: 'recursive' + + - uses: ActivityWatch/check-version-format-action@v2 + id: version + with: + prefix: 'v' + + - name: Echo version + run: | + echo "${{ steps.version.outputs.full }} (stable: ${{ steps.version.outputs.is_stable }})" + + - name: Set RELEASE + run: | + # Build in release mode if on a tag/release (longer build times) + echo "RELEASE=${{ startsWith(github.ref_name, 'v') }}" >> $GITHUB_ENV + + - name: Set up JDK + uses: actions/setup-java@v1 + with: + java-version: ${{ env.JAVA_VERSION }} + + # Android SDK & NDK + - name: Set up Android SDK + uses: android-actions/setup-android@v2 + - name: Set up Android NDK + run: | + sdkmanager "ndk;${{ env.NDK_VERSION }}" + ANDROID_NDK_HOME="$ANDROID_SDK_ROOT/ndk/${{ env.NDK_VERSION }}" + ls $ANDROID_NDK_HOME + echo "ANDROID_NDK_HOME=$ANDROID_NDK_HOME" >> $GITHUB_ENV + + # Restores jniLibs from cache + # `actions/cache/restore` only restores, without saving back in a post-hook + - uses: actions/cache/restore@v3 + id: cache-jniLibs + env: + cache-name: jniLibs + with: + path: mobile/src/main/jniLibs/ + key: ${{ env.cache-name }}-release-${{ env.RELEASE }}-ndk-${{ env.NDK_VERSION }}-${{ hashFiles('.git/modules/aw-server-rust/HEAD') }} + fail-on-cache-miss: true + + - name: Check that jniLibs present + run: | + test -e mobile/src/main/jniLibs/x86_64/libaw_server.so + + - name: Set versionName + if: startsWith(github.ref, 'refs/tags/v') # only on runs triggered from tag + run: | + # Sets versionName, tail used to skip "v" at start of tag name + SHORT_VERSION=$(echo "${{ github.ref_name }}" | tail -c +2 -) + sed -i "s/versionName \".*\"/versionName \"$SHORT_VERSION\"/g" \ + mobile/build.gradle + + - name: Set versionCode + run: | + # Sets versionCode + sed -i "s/versionCode .*/versionCode ${{needs.get-versionCode.outputs.versionCode}}/" \ + mobile/build.gradle + + - uses: adnsio/setup-age-action@v1.2.0 + - name: Load Android secrets + if: env.KEY_ANDROID_JKS != null + env: + KEY_ANDROID_JKS: ${{ secrets.KEY_ANDROID_JKS }} + run: | + printf "$KEY_ANDROID_JKS" > android.jks.key + cat android.jks.age | age -d -i android.jks.key -o android.jks + rm android.jks.key + + - name: Assemble + env: + JKS_STOREPASS: ${{ secrets.KEY_ANDROID_JKS_STOREPASS }} + JKS_KEYPASS: ${{ secrets.KEY_ANDROID_JKS_KEYPASS }} + run: | + make dist/aw-android.${{ matrix.type }} + + - name: Upload + uses: actions/upload-artifact@v3 + with: + name: aw-android + path: dist/aw-android*.${{ matrix.type }} From d54aed05255977357b1f79f4142d6c39bdedca4d Mon Sep 17 00:00:00 2001 From: Brayo Date: Mon, 22 Jul 2024 10:40:18 +0300 Subject: [PATCH 4/6] ci: add release-gh to build-only.yml --- .github/workflows/build-only.yml | 34 ++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/.github/workflows/build-only.yml b/.github/workflows/build-only.yml index bbcc778..b5fcf69 100644 --- a/.github/workflows/build-only.yml +++ b/.github/workflows/build-only.yml @@ -198,3 +198,37 @@ jobs: with: name: aw-android path: dist/aw-android*.${{ matrix.type }} + + release-gh: + needs: [build-apk] + if: startsWith(github.ref, 'refs/tags/v') # only on runs triggered from tag + runs-on: ubuntu-latest + steps: + + # Will download all artifacts to path + - name: Download release APK & AAB + uses: actions/download-artifact@v3 + with: + name: aw-android + path: dist + + - name: Display structure of downloaded files + working-directory: dist + run: ls -R + + # detect if version tag is stable/beta + - uses: nowsprinting/check-version-format-action@v2 + id: version + with: + prefix: 'v' + + # create a release + - name: Release + uses: softprops/action-gh-release@v1 + with: + draft: true + prerelease: ${{ !(steps.version.outputs.is_stable == 'true') }} # must compare to true, since boolean outputs are actually just strings, and "false" is truthy since it's not empty: https://github.com/actions/runner/issues/1483#issuecomment-994986996 + files: | + dist/*.apk + dist/*.aab + # body_path: dist/release_notes/release_notes.md \ No newline at end of file From 53ed4a31c508be7a9b3b884b0f39a3040d331c6c Mon Sep 17 00:00:00 2001 From: Brayo Date: Wed, 4 Sep 2024 17:17:49 +0300 Subject: [PATCH 5/6] chore: replace the default android.jks.age --- android.jks.age | Bin 2425 -> 5425 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/android.jks.age b/android.jks.age index 7a1d3290b561c2f8712c7c39600b989303626836..9d9b8d4fd961f27f9148d7006c2cf81bba07fb9b 100644 GIT binary patch literal 5425 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 b!8z4X%JS1SeEZe9W#!bOGqlEGzM8mEU}tp@ delta 2418 zcmV-&361u#D)|zSAb&PiZ%<-3Z8>2`Zg^HvdT%mlWm;xrPD*2BX>n&`MRHnob#!r5 zLSbW9cM5VwX*V)cQ!r&QPE&SPX-qRYc|uTGR5V0wHBwVpcy~}#c{f&aWo~&yFbXX# zEg)@IWNj;PNHJn-H*IKHYGqeeHy0+ zH$q~*77fUAHZu{K1(%Cf1Gn>(4kKanj^X5)w$;|VNf+3$Z_mckb;{;D-lh5`K${KW zAh}!{)Yp1jO!C6I?vn}(cVn}0>~q5;!j8d~%+`6_td+!!J<+P=gzTZ_8@MEJ5G_hf4HWz1Y>dGt;d zeSu*RK0kBC<*af0#K6PH?)~J-PPeqeF2>QeR|@4DtUO`zpL#v%eD{sa!9FRD!LfRR z(`N#LI-n!>>j=if+n0DL(Y(yC&ARF;z}9N|c=kJlvVRR_Ht+-6+5|lMbE=aAdJ)rU z1&{1ghK|>L`W`r2;e+N$-M8#HtYx+7K|1_wlP@rI z3n!ITbjf}!vsFnI4|3+_U4+Mp0FIU1bPL4^LoSqY#R-o>5Ol&YTOU$ad=gA#G<6AM zp%IW5^?&w`e;mhUbipC)QLpg0Blc*Mj7FUe;NsFalK}Hf!DazTwP>vBGAc$r1attN z_o=O(5H zq9}3U?zrETriO<&azln*Q9R5U~`e+S@(%#Ww#f3(3|^H@9=i{;s@UE(cB8-@ydot;}WeXvkaAj#S6+#*a!%~CjGjba^{a;%C*nee~iEjvgS4LN_sTgO>FfIg@XwPMa;Q&TC z9$?4>k~?d)c0ZWmH*78!4SE;~ytBMz9sH*rCmd{=PG7E%m8Y>;&_b6~$157Z8a-W} zWrecsaU^f|ho0HN44RHSUxxBxlN-Q+b$`?rgBaBl=VcErR|;+f;JRrZ@as-7&VQJL zdPuwvM(J_OJ``=^)@(Bby^VepR0tKHRh&Ytx$ z#?t^aPQRAg20uX_4fp!Fjld4P9P#9+uI(gWyY$wufbb*YYsoGls4OrwjfTWUX?<%p zp!`PDguoOxjbTLR=)uOtwp%)kfD+X{8gw?)8{yPXtVX-xseJ7WQn()djek~t;L`w8 zAf7%PdwBQhr^tTE;sT>luF%XN_RW35B3x@Vz&SGd(A(F6pdFy0&>EIw{r9B17$-?2{+8JnLE;*+zMXEO zyeZ#!ZKDlHT=|~DS4ZvI0l{Pkx2Z{-vdlB0&ZP~6^bRI+RGYe}JW?W;%M;#5ma6%W%!(p>pL{BT+~RR6_VA@dB>ZMD!PYynktP+%HUHZ8zPQHI?GORB6fa+gb4T?d1akz zP-GPJ!shedqgbmiVh=g7LQ%Hwn0e(x1k84$yVk852UTYsYk$%s<8^qwwTbayGNIQc zdic1}0h!lzTnT0;w*5Bx_gaoz4DH|$#ysQ_>1a}qj-I+%$-5XMv*tAD*u13xWB9lV z5-#8&uj1*L2si5L_{A9#I;n{=Z-Y%RyBKboa8lYaVo@N~?>cv#0k1fO0VV__h)AG~ zEA)mNn6Eg*dw<>+tUj%-GPdTR*U<~QFLWh@->J;&z;F;|aF#h2-hwmAngc&RTR^qb zFmr(H7#qI@;0+xH`C)h{ikQB~sVh&-Pl`#2zO<2#f(m}aoqYrbj*UBAZF>k?@m1+C zv7V(8Z3_OZECqOeLC#5_e_;3R#%vAjZK8xf=2M}=CV#5pbp*#>y-WfJRwBzUJC7+i zI~JUlPkTMBUCL`U?;k{IvS?Emw9WWH)e1)wmf0MyvAZe0;toS$gw`ompjV3Sm^HuiExaL5g~s zOvX9%-PoWeZ6DvF)uujRDh$5Cwjk08^o-`8$27w{^@3e^P7Ro-ovupn{aQuXcC8(MR$PFkcPR5FIBQ`{(eIc);UclEXf^u}JA!X@L_&C0 zDlV-?<;l&rwn?JKUq^4iP{h{W*>?!`BP7BHCuWl(6_%P?$f;-Goqd(W3Z4!RU$nQu kMG3=B!iB@D<{-;J-tCe!_&i^B5R`TD?IWlp3igQwQ*FYG%K!iX From 854877ed3a342b134893a0c56239f9fbd4262769 Mon Sep 17 00:00:00 2001 From: Brayo Date: Wed, 4 Sep 2024 23:20:37 +0300 Subject: [PATCH 6/6] ci:set rust version to 1.79.0 --- .github/workflows/build-only.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-only.yml b/.github/workflows/build-only.yml index b5fcf69..ece337a 100644 --- a/.github/workflows/build-only.yml +++ b/.github/workflows/build-only.yml @@ -55,7 +55,7 @@ jobs: # Rust - name: Set up Rust id: toolchain - uses: dtolnay/rust-toolchain@stable + uses: dtolnay/rust-toolchain@1.79.0 if: steps.cache-jniLibs.outputs.cache-hit != 'true' - name: Set up Rust toolchain for Android NDK