From 8491fa3a8bb646ec6760bdc6f4cae1b6fb17702f Mon Sep 17 00:00:00 2001 From: wiiznokes <78230769+wiiznokes@users.noreply.github.com> Date: Sat, 9 Aug 2025 19:11:33 +0200 Subject: [PATCH 1/9] don't use opt --- .github/workflows/ci.yml | 4 ++-- .github/workflows/nightly.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f428783b..9bb6e57e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,8 +45,8 @@ jobs: - name: Compile Rust lib run: | wget -q "https://dl.google.com/android/repository/android-ndk-${{ steps.versions.outputs.ndk }}-linux.zip" - unzip -q "./android-ndk-${{ steps.versions.outputs.ndk }}-linux.zip" -d /opt - make NDK_PATH="/opt/android-ndk-${{ steps.versions.outputs.ndk }}/toolchains/llvm/prebuilt/linux-x86_64/bin" -C app/src/main/rust build_install + unzip -q "./android-ndk-${{ steps.versions.outputs.ndk }}-linux.zip" + make NDK_PATH="$(pwd)/android-ndk-${{ steps.versions.outputs.ndk }}/toolchains/llvm/prebuilt/linux-x86_64/bin" -C app/src/main/rust build_install - name: Build App run: | diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index b80763c6..d20cd292 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -53,8 +53,8 @@ jobs: - name: Compile Rust lib run: | wget -q "https://dl.google.com/android/repository/android-ndk-${{ steps.versions.outputs.ndk }}-linux.zip" - unzip -q "./android-ndk-${{ steps.versions.outputs.ndk }}-linux.zip" -d /opt - 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 + unzip -q "./android-ndk-${{ steps.versions.outputs.ndk }}-linux.zip" + make NDK_PATH="(pwd)/android-ndk-${{ steps.versions.outputs.ndk }}/toolchains/llvm/prebuilt/linux-x86_64/bin" DEBUG=0 -C app/src/main/rust build_install - name: Build App run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index efc512e7..90f1b54d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -58,8 +58,8 @@ jobs: - name: Compile Rust lib run: | wget -q "https://dl.google.com/android/repository/android-ndk-${{ steps.versions.outputs.ndk }}-linux.zip" - unzip -q "./android-ndk-${{ steps.versions.outputs.ndk }}-linux.zip" -d /opt - 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 + unzip -q "./android-ndk-${{ steps.versions.outputs.ndk }}-linux.zip" + make NDK_PATH="(pwd)/android-ndk-${{ steps.versions.outputs.ndk }}/toolchains/llvm/prebuilt/linux-x86_64/bin" DEBUG=0 -C app/src/main/rust build_install - name: Retrieve the secret and decode it to a file and Build App env: From 3c4d185fbadc1f220e13bc3df30787b67aab7c50 Mon Sep 17 00:00:00 2001 From: wiiznokes <78230769+wiiznokes@users.noreply.github.com> Date: Sat, 9 Aug 2025 19:16:41 +0200 Subject: [PATCH 2/9] add a rust flag --- app/src/main/rust/.cargo/config.toml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 app/src/main/rust/.cargo/config.toml diff --git a/app/src/main/rust/.cargo/config.toml b/app/src/main/rust/.cargo/config.toml new file mode 100644 index 00000000..5963c313 --- /dev/null +++ b/app/src/main/rust/.cargo/config.toml @@ -0,0 +1,2 @@ +[build] +rustflags = ["-C", "link-arg=-Wl,--build-id=none"] From 481ee885d4618bef69a5b5d22419a4cc93992992 Mon Sep 17 00:00:00 2001 From: wiiznokes <78230769+wiiznokes@users.noreply.github.com> Date: Sat, 9 Aug 2025 19:21:31 +0200 Subject: [PATCH 3/9] fix: add $ --- .github/workflows/nightly.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index d20cd292..44b1d8e9 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -54,7 +54,7 @@ jobs: run: | wget -q "https://dl.google.com/android/repository/android-ndk-${{ steps.versions.outputs.ndk }}-linux.zip" unzip -q "./android-ndk-${{ steps.versions.outputs.ndk }}-linux.zip" - make NDK_PATH="(pwd)/android-ndk-${{ steps.versions.outputs.ndk }}/toolchains/llvm/prebuilt/linux-x86_64/bin" DEBUG=0 -C app/src/main/rust build_install + make NDK_PATH="$(pwd)/android-ndk-${{ steps.versions.outputs.ndk }}/toolchains/llvm/prebuilt/linux-x86_64/bin" DEBUG=0 -C app/src/main/rust build_install - name: Build App run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 90f1b54d..d4edb05c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -59,7 +59,7 @@ jobs: run: | wget -q "https://dl.google.com/android/repository/android-ndk-${{ steps.versions.outputs.ndk }}-linux.zip" unzip -q "./android-ndk-${{ steps.versions.outputs.ndk }}-linux.zip" - make NDK_PATH="(pwd)/android-ndk-${{ steps.versions.outputs.ndk }}/toolchains/llvm/prebuilt/linux-x86_64/bin" DEBUG=0 -C app/src/main/rust build_install + make NDK_PATH="$(pwd)/android-ndk-${{ steps.versions.outputs.ndk }}/toolchains/llvm/prebuilt/linux-x86_64/bin" DEBUG=0 -C app/src/main/rust build_install - name: Retrieve the secret and decode it to a file and Build App env: From b399e2da11c573816d887a1d4da9515a26e98019 Mon Sep 17 00:00:00 2001 From: wiiznokes <78230769+wiiznokes@users.noreply.github.com> Date: Sun, 10 Aug 2025 02:55:36 +0200 Subject: [PATCH 4/9] Update Cargo.toml --- app/src/main/rust/Cargo.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/src/main/rust/Cargo.toml b/app/src/main/rust/Cargo.toml index 68a141eb..1c5cc7d3 100644 --- a/app/src/main/rust/Cargo.toml +++ b/app/src/main/rust/Cargo.toml @@ -19,3 +19,7 @@ ssh-key = { version = "0.6", default-features = false, features = ["alloc", "ed2 anyhow = "1" zeroize = "1" libgit2-sys = "0.18" + + +[profile.release] +strip = "symbols" \ No newline at end of file From 1cfd5e43b431ec04138a8dbda9825bc250166434 Mon Sep 17 00:00:00 2001 From: wiiznokes <78230769+wiiznokes@users.noreply.github.com> Date: Sun, 10 Aug 2025 15:36:46 +0200 Subject: [PATCH 5/9] Update nightly.yml --- .github/workflows/nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 44b1d8e9..843ef28f 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -54,7 +54,7 @@ jobs: run: | wget -q "https://dl.google.com/android/repository/android-ndk-${{ steps.versions.outputs.ndk }}-linux.zip" unzip -q "./android-ndk-${{ steps.versions.outputs.ndk }}-linux.zip" - make NDK_PATH="$(pwd)/android-ndk-${{ steps.versions.outputs.ndk }}/toolchains/llvm/prebuilt/linux-x86_64/bin" DEBUG=0 -C app/src/main/rust build_install + make SOURCE_DATE_EPOCH=0 NDK_PATH="$(pwd)/android-ndk-${{ steps.versions.outputs.ndk }}/toolchains/llvm/prebuilt/linux-x86_64/bin" DEBUG=0 -C app/src/main/rust build_install - name: Build App run: | From a5fe5f4d9180f4c6186e2f723a64e15fb5e90248 Mon Sep 17 00:00:00 2001 From: wiiznokes <78230769+wiiznokes@users.noreply.github.com> Date: Wed, 13 Aug 2025 12:59:21 +0200 Subject: [PATCH 6/9] temporaly remove cache --- .github/workflows/nightly.yml | 6 +++--- .github/workflows/release.yml | 8 ++++---- app/src/main/rust/.gitignore | 3 ++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 843ef28f..6eb53025 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -46,9 +46,9 @@ jobs: toolchain: ${{ steps.versions.outputs.rust }} targets: aarch64-linux-android, x86_64-linux-android - - uses: Swatinem/rust-cache@v2 - with: - workspaces: "./app/src/main/rust/" + # - uses: Swatinem/rust-cache@v2 + # with: + # workspaces: "./app/src/main/rust/" - name: Compile Rust lib run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d4edb05c..396d5c10 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -51,15 +51,15 @@ jobs: toolchain: ${{ steps.versions.outputs.rust }} targets: aarch64-linux-android, x86_64-linux-android - - uses: Swatinem/rust-cache@v2 - with: - workspaces: "./app/src/main/rust/" + # - uses: Swatinem/rust-cache@v2 + # with: + # workspaces: "./app/src/main/rust/" - name: Compile Rust lib run: | wget -q "https://dl.google.com/android/repository/android-ndk-${{ steps.versions.outputs.ndk }}-linux.zip" unzip -q "./android-ndk-${{ steps.versions.outputs.ndk }}-linux.zip" - make NDK_PATH="$(pwd)/android-ndk-${{ steps.versions.outputs.ndk }}/toolchains/llvm/prebuilt/linux-x86_64/bin" DEBUG=0 -C app/src/main/rust build_install + make SOURCE_DATE_EPOCH=0 NDK_PATH="$(pwd)/android-ndk-${{ steps.versions.outputs.ndk }}/toolchains/llvm/prebuilt/linux-x86_64/bin" DEBUG=0 -C app/src/main/rust build_install - name: Retrieve the secret and decode it to a file and Build App env: diff --git a/app/src/main/rust/.gitignore b/app/src/main/rust/.gitignore index aae6ca95..1d161777 100644 --- a/app/src/main/rust/.gitignore +++ b/app/src/main/rust/.gitignore @@ -1,2 +1,3 @@ target/ -/openssl-prebuild/*/install \ No newline at end of file +/openssl-prebuild/*/install +/vendor \ No newline at end of file From 39a9569613ab459637ef89410b18ab9faefecc87 Mon Sep 17 00:00:00 2001 From: wiiznokes <78230769+wiiznokes@users.noreply.github.com> Date: Wed, 13 Aug 2025 16:45:51 +0200 Subject: [PATCH 7/9] set in makefile --- .github/workflows/nightly.yml | 2 +- .github/workflows/release.yml | 2 +- app/src/main/rust/Makefile | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 6eb53025..1c724d85 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -54,7 +54,7 @@ jobs: run: | wget -q "https://dl.google.com/android/repository/android-ndk-${{ steps.versions.outputs.ndk }}-linux.zip" unzip -q "./android-ndk-${{ steps.versions.outputs.ndk }}-linux.zip" - make SOURCE_DATE_EPOCH=0 NDK_PATH="$(pwd)/android-ndk-${{ steps.versions.outputs.ndk }}/toolchains/llvm/prebuilt/linux-x86_64/bin" DEBUG=0 -C app/src/main/rust build_install + make NDK_PATH="$(pwd)/android-ndk-${{ steps.versions.outputs.ndk }}/toolchains/llvm/prebuilt/linux-x86_64/bin" DEBUG=0 -C app/src/main/rust build_install - name: Build App run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 396d5c10..fdcce23f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -59,7 +59,7 @@ jobs: run: | wget -q "https://dl.google.com/android/repository/android-ndk-${{ steps.versions.outputs.ndk }}-linux.zip" unzip -q "./android-ndk-${{ steps.versions.outputs.ndk }}-linux.zip" - make SOURCE_DATE_EPOCH=0 NDK_PATH="$(pwd)/android-ndk-${{ steps.versions.outputs.ndk }}/toolchains/llvm/prebuilt/linux-x86_64/bin" DEBUG=0 -C app/src/main/rust build_install + make NDK_PATH="$(pwd)/android-ndk-${{ steps.versions.outputs.ndk }}/toolchains/llvm/prebuilt/linux-x86_64/bin" DEBUG=0 -C app/src/main/rust build_install - name: Retrieve the secret and decode it to a file and Build App env: diff --git a/app/src/main/rust/Makefile b/app/src/main/rust/Makefile index e8091a02..3da738b7 100644 --- a/app/src/main/rust/Makefile +++ b/app/src/main/rust/Makefile @@ -1,6 +1,8 @@ DEBUG ?= 1 NDK_PATH ?= ${HOME}/Android/Sdk/ndk/27.3.13750724/toolchains/llvm/prebuilt/linux-x86_64/bin +SOURCE_DATE_EPOCH ?= 0 + ifeq ($(DEBUG),0) ARGS := --release endif From 48b375da0953eed2a12cfd9437a5ae62d7de8d92 Mon Sep 17 00:00:00 2001 From: wiiznokes <78230769+wiiznokes@users.noreply.github.com> Date: Thu, 14 Aug 2025 16:01:06 +0200 Subject: [PATCH 8/9] Revert "set in makefile" This reverts commit 39a9569613ab459637ef89410b18ab9faefecc87. --- .github/workflows/nightly.yml | 2 +- .github/workflows/release.yml | 2 +- app/src/main/rust/Makefile | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 1c724d85..6eb53025 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -54,7 +54,7 @@ jobs: run: | wget -q "https://dl.google.com/android/repository/android-ndk-${{ steps.versions.outputs.ndk }}-linux.zip" unzip -q "./android-ndk-${{ steps.versions.outputs.ndk }}-linux.zip" - make NDK_PATH="$(pwd)/android-ndk-${{ steps.versions.outputs.ndk }}/toolchains/llvm/prebuilt/linux-x86_64/bin" DEBUG=0 -C app/src/main/rust build_install + make SOURCE_DATE_EPOCH=0 NDK_PATH="$(pwd)/android-ndk-${{ steps.versions.outputs.ndk }}/toolchains/llvm/prebuilt/linux-x86_64/bin" DEBUG=0 -C app/src/main/rust build_install - name: Build App run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fdcce23f..396d5c10 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -59,7 +59,7 @@ jobs: run: | wget -q "https://dl.google.com/android/repository/android-ndk-${{ steps.versions.outputs.ndk }}-linux.zip" unzip -q "./android-ndk-${{ steps.versions.outputs.ndk }}-linux.zip" - make NDK_PATH="$(pwd)/android-ndk-${{ steps.versions.outputs.ndk }}/toolchains/llvm/prebuilt/linux-x86_64/bin" DEBUG=0 -C app/src/main/rust build_install + make SOURCE_DATE_EPOCH=0 NDK_PATH="$(pwd)/android-ndk-${{ steps.versions.outputs.ndk }}/toolchains/llvm/prebuilt/linux-x86_64/bin" DEBUG=0 -C app/src/main/rust build_install - name: Retrieve the secret and decode it to a file and Build App env: diff --git a/app/src/main/rust/Makefile b/app/src/main/rust/Makefile index 3da738b7..e8091a02 100644 --- a/app/src/main/rust/Makefile +++ b/app/src/main/rust/Makefile @@ -1,8 +1,6 @@ DEBUG ?= 1 NDK_PATH ?= ${HOME}/Android/Sdk/ndk/27.3.13750724/toolchains/llvm/prebuilt/linux-x86_64/bin -SOURCE_DATE_EPOCH ?= 0 - ifeq ($(DEBUG),0) ARGS := --release endif From dc8e08abf23eb421e10b16bbb804dcd7e48373bc Mon Sep 17 00:00:00 2001 From: wiiznokes <78230769+wiiznokes@users.noreply.github.com> Date: Sat, 16 Aug 2025 13:53:15 +0200 Subject: [PATCH 9/9] c --- .github/workflows/nightly.yml | 6 +++--- .github/workflows/release.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 6eb53025..843ef28f 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -46,9 +46,9 @@ jobs: toolchain: ${{ steps.versions.outputs.rust }} targets: aarch64-linux-android, x86_64-linux-android - # - uses: Swatinem/rust-cache@v2 - # with: - # workspaces: "./app/src/main/rust/" + - uses: Swatinem/rust-cache@v2 + with: + workspaces: "./app/src/main/rust/" - name: Compile Rust lib run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 396d5c10..bad636ca 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -51,9 +51,9 @@ jobs: toolchain: ${{ steps.versions.outputs.rust }} targets: aarch64-linux-android, x86_64-linux-android - # - uses: Swatinem/rust-cache@v2 - # with: - # workspaces: "./app/src/main/rust/" + - uses: Swatinem/rust-cache@v2 + with: + workspaces: "./app/src/main/rust/" - name: Compile Rust lib run: |