From 77bdd61c91354bf39b9c1ecf36ef2a7aba6e332c Mon Sep 17 00:00:00 2001 From: Joscha Date: Sat, 3 May 2025 18:14:04 +0200 Subject: [PATCH 1/3] Set up android CI --- .github/workflows/build.yml | 40 +++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7d2bcab..e97c6cf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -69,12 +69,50 @@ jobs: target/release/gdn-cli.exe target/release/gdn-app.exe + build-android: + runs-on: ubuntu-latest + steps: + - name: Check out repo + uses: actions/checkout@v4 + + - name: Set up pnpm + uses: pnpm/action-setup@v4 + with: + version: 10 + + # https://v2.tauri.app/start/prerequisites/#android + - name: Set up rust + run: | + rustup update + rustup target add aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android + + # https://v2.tauri.app/distribute/sign/android/ + - name: Set up Android signing + run: | + cd gdn-app/src-tauri/gen/android + echo "keyAlias=${{ secrets.ANDROID_KEY_ALIAS }}" > key.properties + echo "password=${{ secrets.ANDROID_KEY_PASSWORD }}" >> key.properties + base64 -d <<< "${{ secrets.ANDROID_KEY_BASE64 }}" > $RUNNER_TEMP/keystore.jks + echo "storeFile=$RUNNER_TEMP/keystore.jks" >> key.properties + + - name: Build + run: | + export NDK_HOME="$ANDROID_NDK_HOME" + ./meta/build-android + + - name: Upload + uses: actions/upload-artifact@v4 + with: + name: gdn-android + path: target/release/gdn-app.apk + release: runs-on: ubuntu-latest if: ${{ startsWith(github.ref, 'refs/tags/v') }} needs: - build-linux - build-windows + - build-android permissions: contents: write steps: @@ -85,6 +123,7 @@ jobs: run: | zip -r gdn-linux.zip gdn-linux zip -r gdn-windows.zip gdn-windows + mv gdn-android/gdn-app.apk gdn-android.apk - name: Create new release uses: softprops/action-gh-release@v2 @@ -93,3 +132,4 @@ jobs: files: | gdn-linux.zip gdn-windows.zip + gdn-android.apk From feb5713dc1d1d962cd94c71e27120043015e4c8f Mon Sep 17 00:00:00 2001 From: Joscha Date: Sat, 3 May 2025 18:54:34 +0200 Subject: [PATCH 2/3] CI try #2 --- .github/workflows/build.yml | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e97c6cf..ac54c76 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,6 +18,11 @@ jobs: - name: Check out repo uses: actions/checkout@v4 + - name: Update packages + run: | + sudo apt update + sudo apt upgrade + - name: Set up pnpm uses: pnpm/action-setup@v4 with: @@ -29,9 +34,7 @@ jobs: # https://github.com/tauri-apps/tauri-action?tab=readme-ov-file#usage # https://docs.github.com/en/actions/using-github-hosted-runners/using-github-hosted-runners/customizing-github-hosted-runners#installing-software-on-ubuntu-runners - name: Install tauri dependencies - run: | - sudo apt update - sudo apt install libwebkit2gtk-4.1-dev + run: sudo apt install libwebkit2gtk-4.1-dev - name: Build run: ./meta/build @@ -50,6 +53,11 @@ jobs: - name: Check out repo uses: actions/checkout@v4 + - name: Update packages + run: | + sudo apt update + sudo apt upgrade + - name: Set up pnpm uses: pnpm/action-setup@v4 with: @@ -75,6 +83,11 @@ jobs: - name: Check out repo uses: actions/checkout@v4 + - name: Update packages + run: | + sudo apt update + sudo apt upgrade + - name: Set up pnpm uses: pnpm/action-setup@v4 with: From e12e860ef9d10e2fefa674f76011c3e4b490dae6 Mon Sep 17 00:00:00 2001 From: Joscha Date: Sat, 3 May 2025 19:01:11 +0200 Subject: [PATCH 3/3] CI try #3 --- .github/workflows/build.yml | 8 +++----- rust-toolchain.toml | 3 +++ 2 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 rust-toolchain.toml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ac54c76..75304b0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -53,11 +53,6 @@ jobs: - name: Check out repo uses: actions/checkout@v4 - - name: Update packages - run: | - sudo apt update - sudo apt upgrade - - name: Set up pnpm uses: pnpm/action-setup@v4 with: @@ -83,6 +78,9 @@ jobs: - name: Check out repo uses: actions/checkout@v4 + - name: Set up env vars + run: echo "NDK_HOME=$ANDROID_NDK_HOME" >> $GITHUB_ENV + - name: Update packages run: | sudo apt update diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 0000000..9b4e555 --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,3 @@ +[toolchain] +# https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md#rust-tools +channel = "1.86.0"