Skip to content

Commit 49477f5

Browse files
wiiznokeswiiznokes
authored
static rust and ndk version
1 parent a0dcbce commit 49477f5

File tree

6 files changed

+56
-22
lines changed

6 files changed

+56
-22
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,31 @@ jobs:
2727
distribution: "temurin"
2828
cache: gradle
2929

30-
- name: Install Rust toolchain
30+
- name: Read versions from files
31+
id: versions
3132
run: |
32-
rustup update
33-
rustup target add aarch64-linux-android x86_64-linux-android
33+
echo "rust=$(cat app/src/main/rust/RUST_VERSION)" >> $GITHUB_OUTPUT
34+
echo "ndk=$(cat app/src/main/rust/NDK_VERSION)" >> $GITHUB_OUTPUT
35+
36+
- uses: dtolnay/rust-toolchain@master
37+
with:
38+
toolchain: ${{ steps.versions.outputs.rust }}
39+
targets: aarch64-linux-android, x86_64-linux-android
3440

3541
- uses: Swatinem/rust-cache@v2
3642
with:
3743
workspaces: "./app/src/main/rust/"
44+
45+
- name: Compile Rust lib
46+
run: |
47+
wget -q "https://dl.google.com/android/repository/android-ndk-${{ steps.versions.outputs.ndk }}-linux.zip"
48+
unzip -q "./android-ndk-${{ steps.versions.outputs.ndk }}-linux.zip" -d /opt
49+
make NDK_PATH="/opt/android-ndk-${{ steps.versions.outputs.ndk }}/toolchains/llvm/prebuilt/linux-x86_64/bin" -C app/src/main/rust build_install
3850
39-
- name: Compile
51+
- name: Build App
4052
run: |
41-
wget "https://dl.google.com/android/repository/android-ndk-r27d-linux.zip" > /dev/null 2>&1
42-
unzip ./android-ndk-r27d-linux.zip > /dev/null 2>&1
43-
make NDK_PATH="$(pwd)/android-ndk-r27d/toolchains/llvm/prebuilt/linux-x86_64/bin" -C app/src/main/rust build_install
4453
./gradlew assembleDebug
54+
55+
56+
57+

‎.github/workflows/nightly.yml‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,29 @@ jobs:
3535
distribution: "temurin"
3636
cache: gradle
3737

38-
- name: Install Rust toolchain
38+
- name: Read versions from files
39+
id: versions
3940
run: |
40-
rustup update
41-
rustup target add aarch64-linux-android x86_64-linux-android
41+
echo "rust=$(cat app/src/main/rust/RUST_VERSION)" >> $GITHUB_OUTPUT
42+
echo "ndk=$(cat app/src/main/rust/NDK_VERSION)" >> $GITHUB_OUTPUT
43+
44+
- uses: dtolnay/rust-toolchain@master
45+
with:
46+
toolchain: ${{ steps.versions.outputs.rust }}
47+
targets: aarch64-linux-android, x86_64-linux-android
4248

4349
- uses: Swatinem/rust-cache@v2
4450
with:
4551
workspaces: "./app/src/main/rust/"
4652

47-
- name: Build apk
53+
- name: Compile Rust lib
54+
run: |
55+
wget -q "https://dl.google.com/android/repository/android-ndk-${{ steps.versions.outputs.ndk }}-linux.zip"
56+
unzip -q "./android-ndk-${{ steps.versions.outputs.ndk }}-linux.zip" -d /opt
57+
make NDK_PATH="/opt/android-ndk-${{ steps.versions.outputs.ndk }}/toolchains/llvm/prebuilt/linux-x86_64/bin" DEBUG=0 -C app/src/main/rust build_install
58+
59+
- name: Build App
4860
run: |
49-
wget "https://dl.google.com/android/repository/android-ndk-r27d-linux.zip" > /dev/null 2>&1
50-
unzip ./android-ndk-r27d-linux.zip > /dev/null 2>&1
51-
make NDK_PATH="$(pwd)/android-ndk-r27d/toolchains/llvm/prebuilt/linux-x86_64/bin" DEBUG=0 -C app/src/main/rust build_install
5261
./gradlew assembleNightly
5362
5463
mkdir -p packages

‎.github/workflows/release.yml‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,26 +40,36 @@ jobs:
4040
distribution: "temurin"
4141
cache: gradle
4242

43-
- name: Install Rust toolchain
43+
- name: Read versions from files
44+
id: versions
4445
run: |
45-
rustup update
46-
rustup target add aarch64-linux-android x86_64-linux-android
46+
echo "rust=$(cat app/src/main/rust/RUST_VERSION)" >> $GITHUB_OUTPUT
47+
echo "ndk=$(cat app/src/main/rust/NDK_VERSION)" >> $GITHUB_OUTPUT
48+
49+
- uses: dtolnay/rust-toolchain@master
50+
with:
51+
toolchain: ${{ steps.versions.outputs.rust }}
52+
targets: aarch64-linux-android, x86_64-linux-android
4753

4854
- uses: Swatinem/rust-cache@v2
4955
with:
5056
workspaces: "./app/src/main/rust/"
5157

52-
- name: Retrieve the secret and decode it to a file and Build apk
58+
- name: Compile Rust lib
59+
run: |
60+
wget -q "https://dl.google.com/android/repository/android-ndk-${{ steps.versions.outputs.ndk }}-linux.zip"
61+
unzip -q "./android-ndk-${{ steps.versions.outputs.ndk }}-linux.zip" -d /opt
62+
make NDK_PATH="/opt/android-ndk-${{ steps.versions.outputs.ndk }}/toolchains/llvm/prebuilt/linux-x86_64/bin" DEBUG=0 -C app/src/main/rust build_install
63+
64+
- name: Retrieve the secret and decode it to a file and Build App
5365
env:
5466
KEY_BASE64: ${{ secrets.KEY_BASE64 }}
5567
KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
5668
KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
5769
STORE_PASSWORD: ${{ secrets.KEY_PASSWORD }}
5870
run: |
5971
echo $KEY_BASE64 | base64 --decode > app/key.jks
60-
wget "https://dl.google.com/android/repository/android-ndk-r27d-linux.zip" > /dev/null 2>&1
61-
unzip ./android-ndk-r27d-linux.zip > /dev/null 2>&1
62-
make NDK_PATH="$(pwd)/android-ndk-r27d/toolchains/llvm/prebuilt/linux-x86_64/bin" DEBUG=0 -C app/src/main/rust build_install
72+
6373
./gradlew assembleRelease
6474
6575
mkdir -p packages

‎app/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ android {
5151
minSdk = 30
5252
targetSdk = 36
5353
versionCode = 9
54-
versionName = "25.08"
54+
versionName = "25.08.1"
5555

5656
buildConfigField(
5757
"String",

‎app/src/main/rust/NDK_VERSION‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
r27d

‎app/src/main/rust/RUST_VERSION‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.89.0

0 commit comments

Comments
 (0)