diff --git a/.github/workflows/connect-android.yml b/.github/workflows/connect-android.yml index 8c04105a09..1331ce2cab 100644 --- a/.github/workflows/connect-android.yml +++ b/.github/workflows/connect-android.yml @@ -22,19 +22,20 @@ on: jobs: build: - runs-on: [self-hosted, custom-linux] - env: - RUSTC_WRAPPER: /home/ubuntu/.cargo/bin/sccache - defaults: - run: - working-directory: nym-connect-android/src-tauri/ + #runs-on: [self-hosted, custom-linux] + runs-on: ubuntu-22.04 + #env: + #RUSTC_WRAPPER: /home/ubuntu/.cargo/bin/sccache + #defaults: + #run: + #working-directory: nym-connect-android/src-tauri/ steps: - name: Install Dependencies (Linux) if: ${{ !env.ACT }} run: | sudo apt-get update sudo apt-get -y install \ - libwebkit2gtk-4.0-dev \ + libwebkit2gtk-4.1-dev \ build-essential \ curl \ wget \ @@ -42,8 +43,10 @@ jobs: libgtk-3-dev \ squashfs-tools \ libayatana-appindicator3-dev \ - librsvg2-dev - continue-on-error: true + librsvg2-dev \ + libsoup-3.0-dev \ + libjavascriptcoregtk-4.1-dev + #continue-on-error: true - name: Checkout uses: actions/checkout@v3 @@ -54,18 +57,14 @@ jobs: toolchain: stable components: clippy, rustfmt + - name: Check formatting + run: cargo fmt --manifest-path nym-connect-android/src-tauri/Cargo.toml -- --check + - name: Build all binaries - run: cargo build + run: cargo build --manifest-path nym-connect-android/src-tauri/Cargo.toml - name: Run all tests - run: cargo test - - - name: Check formatting - run: cargo fmt - - - name: Check - continue-on-error: true - run: cargo check + run: cargo test --manifest-path nym-connect-android/src-tauri/Cargo.toml - name: Clippy - run: cargo clippy + run: cargo clippy --manifest-path nym-connect-android/src-tauri/Cargo.toml --all-targets -- -D warnings diff --git a/nym-connect-android/dist/.gitkeep b/nym-connect-android/dist/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/nym-connect-android/src-tauri/src/main.rs b/nym-connect-android/src-tauri/src/main.rs index e7b0e7c071..11ece5dfd8 100644 --- a/nym-connect-android/src-tauri/src/main.rs +++ b/nym-connect-android/src-tauri/src/main.rs @@ -8,9 +8,9 @@ use nym_connect_android::AppBuilder; fn main() { // As per breaking change description here // https://github.com/tauri-apps/tauri/blob/feac1d193c6d618e49916ad0707201f43d5cdd36/tooling/bundler/CHANGELOG.md - if let Err(error) = fix_path_env::fix() { - log::warn!("Failed to fix PATH: {error}"); - } + //if let Err(error) = fix_path_env::fix() { + // log::warn!("Failed to fix PATH: {error}"); + //} AppBuilder::new().run(); }