From 7aade666054ed089f9ad247bd69175a01803a914 Mon Sep 17 00:00:00 2001 From: Jacek Czaja Date: Wed, 19 Aug 2026 10:16:21 +0200 Subject: [PATCH 1/4] - termux build in CI --- .github/workflows/building.yaml | 43 +++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/.github/workflows/building.yaml b/.github/workflows/building.yaml index 1610ebc..61ae88d 100644 --- a/.github/workflows/building.yaml +++ b/.github/workflows/building.yaml @@ -64,28 +64,39 @@ jobs: run: | cargo test - build_and_test_no_gui: - name: etradeTaxReturnHelper building + build_termux: + name: etradeTaxReturnHelper Termux (Android aarch64) building runs-on: ubuntu-latest steps: - - name: Install system dependencies - run: | - sudo apt-get update - - uses: actions/checkout@v2 - - uses: actions-rs/toolchain@v1 + - uses: actions/checkout@v3 + + - name: Install Rust toolchain + uses: dtolnay/rust-toolchain@stable with: - toolchain: stable - - name: Cargo build - env: - LIBRARY_PATH: ./ - run: | - cargo build --release --no-default-features - - name: Cargo test - env: - LIBRARY_PATH: ./ + targets: aarch64-linux-android + + - name: Setup Android NDK + uses: nsetup/setup-android-ndk@v1 + with: + ndk-version: r25c + + - name: Install cross + run: cargo install cross --git https://github.com/cross-rs/cross + + - name: Cargo test (no GUI) run: | cargo test --no-default-features + - name: Cargo build for Termux + run: | + cross build --target aarch64-linux-android --release --no-default-features + + - name: Archive Termux binary + uses: actions/upload-artifact@v4 + with: + name: etradeTaxReturnHelper-termux-aarch64 + path: target/aarch64-linux-android/release/etradeTaxReturnHelper + build_and_test_with_gen_exchange_rates: name: etradeTaxReturnHelper gen_exchange_rates building runs-on: ubuntu-latest From 453458ad5496fc0ef4dacc89a8e3e0724262d778 Mon Sep 17 00:00:00 2001 From: Jacek Czaja Date: Wed, 19 Aug 2026 10:22:52 +0200 Subject: [PATCH 2/4] - Fix to CI --- .github/workflows/building.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/building.yaml b/.github/workflows/building.yaml index 61ae88d..71dbf2e 100644 --- a/.github/workflows/building.yaml +++ b/.github/workflows/building.yaml @@ -76,7 +76,7 @@ jobs: targets: aarch64-linux-android - name: Setup Android NDK - uses: nsetup/setup-android-ndk@v1 + uses: ncipollo/actions-setup-ndk@v1 with: ndk-version: r25c From d724604d1fbc52d8302c45cd783738961e847d35 Mon Sep 17 00:00:00 2001 From: Jacek Czaja Date: Wed, 19 Aug 2026 10:26:43 +0200 Subject: [PATCH 3/4] - fix to CI (another one) --- .github/workflows/building.yaml | 50 +++++++++++++++------------------ 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/.github/workflows/building.yaml b/.github/workflows/building.yaml index 71dbf2e..6c73200 100644 --- a/.github/workflows/building.yaml +++ b/.github/workflows/building.yaml @@ -63,39 +63,33 @@ jobs: LIBRARY_PATH: ./ run: | cargo test - build_termux: - name: etradeTaxReturnHelper Termux (Android aarch64) building - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@stable - with: - targets: aarch64-linux-android + name: etradeTaxReturnHelper Termux (Android aarch64) building + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + + - name: Install Rust toolchain + uses: dtolnay/rust-toolchain@stable + with: + targets: aarch64-linux-android - - name: Setup Android NDK - uses: ncipollo/actions-setup-ndk@v1 - with: - ndk-version: r25c + - name: Install cross + run: cargo install cross --git https://github.com/cross-rs/cross - - name: Install cross - run: cargo install cross --git https://github.com/cross-rs/cross + - name: Cargo test (no GUI) + run: | + cargo test --no-default-features - - name: Cargo test (no GUI) - run: | - cargo test --no-default-features - - - name: Cargo build for Termux - run: | - cross build --target aarch64-linux-android --release --no-default-features + - name: Cargo build for Termux + run: | + cross build --target aarch64-linux-android --release --no-default-features - - name: Archive Termux binary - uses: actions/upload-artifact@v4 - with: - name: etradeTaxReturnHelper-termux-aarch64 - path: target/aarch64-linux-android/release/etradeTaxReturnHelper + - name: Archive Termux binary + uses: actions/upload-artifact@v4 + with: + name: etradeTaxReturnHelper-termux-aarch64 + path: target/aarch64-linux-android/release/etradeTaxReturnHelper build_and_test_with_gen_exchange_rates: name: etradeTaxReturnHelper gen_exchange_rates building From 419e834ff5ca6a9adf2be6fbce6ee487d571077f Mon Sep 17 00:00:00 2001 From: Jacek Czaja Date: Wed, 19 Aug 2026 10:36:52 +0200 Subject: [PATCH 4/4] - made request to use rust-tls not openssl --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 1bb5eac..47a60b1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,7 +34,7 @@ gen_exchange_rates = ["serde_json"] [dependencies] pdf = "0.7.2" chrono = "0.4" -reqwest = { version = "0.11.16", features = ["blocking", "json"] } +reqwest = { version = "0.11.16", default-features = false, features = ["blocking","json", "rustls-tls-webpki-roots"] } serde = { version = "1.0.104", features = ["derive"] } roxmltree = "0.20.0" simple_logger = "4.0.0"