diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7d59efa7f..2591f4793 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,35 +11,37 @@ jobs: build_and_test: name: build and test on ${{ matrix.name }} runs-on: ${{ matrix.os }} + strategy: matrix: - name: [android, linux, windows] + # name: [android, linux, windows] + name: [windows] include: - - name: android - os: ubuntu-latest - target: aarch64-linux-android - ndk: - version: r25c - abi: arm64-v8a - test-env: - OUISYNC_LIB: ouisync-plugin/ouisync/target/release/libouisync_ffi.so - build-args: apk --target-platform android-arm64 - - - name: linux - os: ubuntu-latest - analyze: true - test-env: - OUISYNC_LIB: ouisync-plugin/ouisync/target/release/libouisync_ffi.so - build-args: + # - name: android + # os: ubuntu-latest + # target: aarch64-linux-android + # ndk: + # version: r25c + # abi: arm64-v8a + # test-env: + # OUISYNC_LIB: ouisync-plugin/ouisync/target/release/libouisync_ffi.so + # build-args: apk --target-platform android-arm64 + + # - name: linux + # os: ubuntu-latest + # analyze: true + # test-env: + # OUISYNC_LIB: ouisync-plugin/ouisync/target/release/libouisync_ffi.so + # build-args: - name: windows os: windows-latest test-env: - OUISYNC_LIB: D:\a\ouisync-app\ouisync-app\ouisync-plugin\ouisync\target\release\ouisync_ffi.dll + OUISYNC_LIB: ouisync-plugin\ouisync\target\release\ouisync_ffi.dll build-args: steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: submodules: recursive @@ -68,7 +70,7 @@ jobs: - name: Generate ./ouisync-plugin/ouisync/target/bindings.h run: | cd ouisync-plugin/ouisync - cargo run --bin bindgen + cargo run --package bindgen --bin bindgen - uses: subosito/flutter-action@v2 with: @@ -93,7 +95,7 @@ jobs: cd lib && flutter analyze cd test && flutter analyze cd util && flutter analyze - if: matrix.analyze == 'true' + if: matrix.analyze - name: Build Ouisync library for tests run: | diff --git a/pubspec.lock b/pubspec.lock index d93e4ccb5..c5a93b0b2 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -823,14 +823,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.0" - mockito: - dependency: "direct main" - description: - name: mockito - sha256: "8b46d7eb40abdda92d62edd01546051f0c27365e65608c284de336dccfef88cc" - url: "https://pub.dev" - source: hosted - version: "5.4.1" mocktail: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index ca62e9384..136859c0d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -71,7 +71,6 @@ dependencies: local_auth: ^2.1.2 loggy: ^2.0.1+1 mobile_scanner: ^2.0.0 - mockito: ^5.1.0 move_to_background: ^1.0.2 network_info_plus: ^4.0.1 ouisync_plugin: