CI: separate fastlane and build code...WIP

.github/workflows/build-only.yml

@@ -0,0 +1,251 @@
+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: macos-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: 'recursive'
+    - name: Set RELEASE
+      run: |
+        echo "RELEASE=${{ startsWith(github.ref_name, 'v') }}" >> $GITHUB_ENV
+
+    - name: Get aw-server-rust submodule commit
+      id: submodule-commit
+      run: |
+        echo "commit=$(git rev-parse HEAD:aw-server-rust)" >> $GITHUB_OUTPUT
+
+    - 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 }}-${{ steps.submodule-commit.outputs.commit }}
+
+    - 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-latest
+    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
+
+    - name: Get aw-server-rust submodule commit
+      id: submodule-commit
+      run: |
+        echo "commit=$(git rev-parse HEAD:aw-server-rust)" >> $GITHUB_OUTPUT
+
+    # 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 }}-${{ steps.submodule-commit.outputs.commit }}
+        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/[email protected]
+    - 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@v4
+      with:
+        name: aw-android.${{ matrix.type }}
+        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: macos-latest
+    steps:
+
+    # Will download all artifacts to path
+    - name: Download release APK
+      uses: actions/download-artifact@v6
+      with:
+        name: aw-android.apk
+        path: dist
+
+    - name: Download release AAB
+      uses: actions/download-artifact@v6
+      with:
+        name: aw-android.aab
+        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@v4
+      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
+

.gitmodules

@@ -1,6 +1,7 @@
 [submodule "aw-server-rust"]
 	path = aw-server-rust
-	url = https://github.com/ActivityWatch/aw-server-rust.git
+	url = https://github.com/0xbrayo/aw-server-rust.git
+	branch = dev/sync-jni
 [submodule "mobile/src/main/res/drawable/media"]
 	path = mobile/src/main/res/drawable/media
 	url = https://github.com/ActivityWatch/media.git

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 $@

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)

build.gradle

@@ -1,10 +1,10 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.7.20'
-    ext.androidXTestVersion = '1.5.0'
-    ext.espressoVersion = '3.5.0'
-    ext.extJUnitVersion = '1.1.4'
+    ext.kotlin_version = '1.9.0'
+    ext.androidXTestVersion = '1.7.0'
+    ext.espressoVersion = '3.7.0'
+    ext.extJUnitVersion = '1.3.0'
     ext.servicesVersion = '1.4.2'
     repositories {
         google()
@@ -14,7 +14,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.1'
+        classpath 'com.android.tools.build:gradle:8.13.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'gradle.plugin.org.mozilla.rust-android-gradle:plugin:0.8.3'