Tests fixes and small adjustments (#34)

New pubspecs without local path references
isar-community · Mar 27, 2024 · d10191a · d10191a
1 parent b75f93d
commit d10191a
Show file tree

Hide file tree

Showing 14 changed files with 108 additions and 52 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -9,12 +9,18 @@ jobs:
   verify_version:
     name: Verify version matches release
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        sdk: [3.0.0]
     steps:
-      - uses: actions/checkout@v3
-      - uses: dart-lang/setup-dart@v1
+      - uses: actions/checkout@v4
+      - uses: subosito/flutter-action@v2
+        with:
+          flutter-version: ${{ vars.FLUTTER_VERSION }}
       - name: Verify release version
         run: |
-          dart pub get
+          flutter pub get
           dart tool/verify_release_version.dart ${{ github.ref_name }}
         working-directory: packages/isar
 
@@ -56,7 +62,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Prepare Build
         uses: ./.github/actions/prepare-build
       - name: Set env
@@ -81,16 +87,18 @@ jobs:
     needs: build_binaries
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: subosito/flutter-action@v2
+        with:
+          flutter-version: ${{ vars.FLUTTER_VERSION }}
       - name: Build
         run: flutter build web --base-href /${{ github.ref_name }}/
         working-directory: packages/isar_inspector
       - name: Deploy to GitHub Pages
         uses: JamesIves/github-pages-deploy-action@v4
         with:
           folder: packages/isar_inspector/build/web
-          repository-name: isar/inspector
+          repository-name: isar-community/inspector
           token: ${{ secrets.TOKEN }}
           target-folder: ${{ github.ref_name }}
           clean: false
@@ -100,7 +108,7 @@ jobs:
   #   needs: build_inspector
   #   runs-on: ubuntu-latest
   #   steps:
-  #     - uses: actions/checkout@v3
+  #     - uses: actions/checkout@v4
   #     - uses: subosito/flutter-action@v2
   #     - name: pub get
   #       run: dart pub get

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -9,15 +9,26 @@ on:
       - v3
 
 jobs:
+  version:
+    name: Version Display
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          flutter-version: ${{ vars.FLUTTER_VERSION }}
+      - run: flutter --version
+
   format:
     name: Check formatting
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: ${{ secrets.FLUTTER_VERSION }}
+          flutter-version: ${{ vars.FLUTTER_VERSION }}
       - name: Check formatting
         run: dart format --set-exit-if-changed .
 
@@ -26,11 +37,11 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ false }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: ${{ secrets.FLUTTER_VERSION }}
+          flutter-version: ${{ vars.FLUTTER_VERSION }}
       - run: flutter pub get
         working-directory: packages/isar
       - run: flutter pub get
@@ -39,6 +50,8 @@ jobs:
         working-directory: packages/isar_generator
       - run: flutter pub get
         working-directory: packages/isar_inspector
+      - run: flutter pub get
+        working-directory: examples/pub
       - run: |
           flutter pub get
           flutter pub run build_runner build
@@ -56,8 +69,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - run: echo "$OSTYPE"
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: subosito/flutter-action@v2
+        with:
+          flutter-version: ${{ vars.FLUTTER_VERSION }}
       - name: Prepare Build
         uses: ./.github/actions/prepare-build
       - name: Build Isar Core
@@ -73,8 +88,10 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ false }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: subosito/flutter-action@v2
+        with:
+          flutter-version: ${{ vars.FLUTTER_VERSION }}
       - name: Prepare Build
         uses: ./.github/actions/prepare-build
       - name: Install valgrind and llvm
@@ -99,8 +116,10 @@ jobs:
     name: Code Coverage
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: subosito/flutter-action@v2
+        with:
+          flutter-version: ${{ vars.FLUTTER_VERSION }}
       - name: Prepare Build
         uses: ./.github/actions/prepare-build
       - name: Build Isar Core
@@ -134,8 +153,10 @@ jobs:
     name: Generator Test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: subosito/flutter-action@v2
+        with:
+          flutter-version: ${{ vars.FLUTTER_VERSION }}
       - name: Run Generator Unit tests
         run: |
           dart pub get
@@ -146,12 +167,14 @@ jobs:
     name: Integration Test iOS
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Start simulator
         uses: futureware-tech/simulator-action@v2
         with:
           model: iPhone 13
       - uses: subosito/flutter-action@v2
+        with:
+          flutter-version: ${{ vars.FLUTTER_VERSION }}
       - name: Prepare Build
         uses: ./.github/actions/prepare-build
       - name: Build Isar Core
@@ -168,12 +191,14 @@ jobs:
     name: Integration Test Android
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
           java-version: "11"
           distribution: "zulu"
       - uses: subosito/flutter-action@v2
+        with:
+          flutter-version: ${{ vars.FLUTTER_VERSION }}
       - name: Prepare Build
         uses: ./.github/actions/prepare-build
       - name: Build Isar Core
@@ -200,10 +225,11 @@ jobs:
     name: Integration Test macOS
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: "3.3.10" # https://github.com/flutter/flutter/issues/118469
+          # flutter-version: "3.3.10" # https://github.com/flutter/flutter/issues/118469
+          flutter-version: ${{ vars.FLUTTER_VERSION }}
       - name: Prepare Build
         uses: ./.github/actions/prepare-build
       - name: Build Isar Core
@@ -215,16 +241,18 @@ jobs:
         run: sh tool/prepare_tests.sh
       - name: Run Flutter Driver tests
         run: |
-          flutter config --enable-macos-desktop 
+          flutter config --enable-macos-desktop
           flutter test -d macos integration_test/integration_test.dart --dart-define STRESS=true
         working-directory: packages/isar_test
 
   integration_test_linux:
     name: Integration Test Linux
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: subosito/flutter-action@v2
+        with:
+          flutter-version: ${{ vars.FLUTTER_VERSION }}
       - name: Prepare Build
         uses: ./.github/actions/prepare-build
       - name: Install Linux requirements
@@ -239,7 +267,7 @@ jobs:
         run: sh tool/prepare_tests.sh
       - name: Run Flutter Driver tests
         run: |
-          flutter config --enable-linux-desktop 
+          flutter config --enable-linux-desktop
           flutter test -d linux integration_test/integration_test.dart --dart-define STRESS=true
         working-directory: packages/isar_test
 
@@ -248,8 +276,10 @@ jobs:
     runs-on: windows-2019
     if: ${{ false }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: subosito/flutter-action@v2
+        with:
+          flutter-version: ${{ vars.FLUTTER_VERSION }}
       - name: Prepare Build
         uses: ./.github/actions/prepare-build
       - name: Build Isar Core
@@ -260,16 +290,18 @@ jobs:
         run: sh tool/prepare_tests.sh
       - name: Run Flutter Driver tests
         run: |
-          flutter config --enable-windows-desktop 
+          flutter config --enable-windows-desktop
           flutter test -d windows integration_test/integration_test.dart --dart-define STRESS=true
         working-directory: packages/isar_test
 
   drive_chrome:
     runs-on: ubuntu-latest
     if: ${{ false }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: subosito/flutter-action@v2
+        with:
+          flutter-version: ${{ vars.FLUTTER_VERSION }}
       - name: Install chromedricer
         uses: nanasess/setup-chromedriver@v1
       - name: Prepare chromedricer
@@ -287,8 +319,10 @@ jobs:
     runs-on: macos-latest
     if: ${{ false }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: subosito/flutter-action@v2
+        with:
+          flutter-version: ${{ vars.FLUTTER_VERSION }}
       - name: Prepare safaridricer
         run: |
           sudo safaridriver --enable
@@ -306,8 +340,10 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ false }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: subosito/flutter-action@v2
+        with:
+          flutter-version: ${{ vars.FLUTTER_VERSION }}
       - name: Install geckodriver
         uses: browser-actions/setup-geckodriver@latest
       - name: Prepare geckodriver

diff --git a/.github/workflows/testlab.yaml b/.github/workflows/testlab.yaml
@@ -5,8 +5,10 @@ jobs:
     name: Firebase Testlab Android
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: subosito/flutter-action@v2
+        with:
+          flutter-version: ${{ vars.FLUTTER_VERSION }}
       - name: Prepare Build
         uses: ./.github/actions/prepare-build
       - name: Build Isar Core arm64
@@ -36,12 +38,12 @@ jobs:
       - name: Run tests
         run: |
           gcloud firebase test android run \
-            --project honeyy \
+            --project isar-community \
             --type instrumentation \
             --timeout 5m \
             --device model=hammerhead,version=23  \
             --device model=starqlteue,version=26 \
             --device model=cheetah,version=33 \
             --app build/app/outputs/apk/debug/app-debug.apk \
             --test build/app/outputs/apk/androidTest/debug/app-debug-androidTest.apk
-        working-directory: packages/isar_test
+        working-directory: packages/isar_test
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 members = [
     "packages/isar_core",
     "packages/isar_core_ffi",

diff --git a/packages/isar/lib/src/native/bindings.dart b/packages/isar/lib/src/native/bindings.dart
@@ -2024,8 +2024,8 @@ class IsarCoreBindings {
   }
 
   late final _isar_q_aggregate_long_resultPtr = _lookup<
-          ffi
-          .NativeFunction<ffi.Int64 Function(ffi.Pointer<CAggregationResult>)>>(
+          ffi.NativeFunction<
+              ffi.Int64 Function(ffi.Pointer<CAggregationResult>)>>(
       'isar_q_aggregate_long_result');
   late final _isar_q_aggregate_long_result = _isar_q_aggregate_long_resultPtr
       .asFunction<int Function(ffi.Pointer<CAggregationResult>)>();
@@ -2088,9 +2088,9 @@ class IsarCoreBindings {
   }
 
   late final _isar_txn_finishPtr = _lookup<
-          ffi
-          .NativeFunction<ffi.Int64 Function(ffi.Pointer<CIsarTxn>, ffi.Bool)>>(
-      'isar_txn_finish');
+      ffi.NativeFunction<
+          ffi.Int64 Function(
+              ffi.Pointer<CIsarTxn>, ffi.Bool)>>('isar_txn_finish');
   late final _isar_txn_finish = _isar_txn_finishPtr
       .asFunction<int Function(ffi.Pointer<CIsarTxn>, bool)>();
 

diff --git a/packages/isar/lib/src/native/isar_core.dart b/packages/isar/lib/src/native/isar_core.dart
@@ -37,7 +37,8 @@ const nullBool = IsarObject_NULL_BOOL;
 const falseBool = IsarObject_FALSE_BOOL;
 const trueBool = IsarObject_TRUE_BOOL;
 
-const String _githubUrl = 'https://github.com/isar-community/isar/releases/download';
+const String _githubUrl =
+    'https://github.com/isar-community/isar/releases/download';
 
 bool _isarInitialized = false;
 
@@ -119,7 +120,9 @@ String _getLibraryDownloadPath(Map<Abi, String> libraries) {
     if (Platform.script.path.isEmpty) {
       return name;
     }
-    var dir = Platform.script.pathSegments.sublist(0, Platform.script.pathSegments.length - 1).join(Platform.pathSeparator);
+    var dir = Platform.script.pathSegments
+        .sublist(0, Platform.script.pathSegments.length - 1)
+        .join(Platform.pathSeparator);
     if (!Platform.isWindows) {
       // Not on windows, add leading platform path separator
       dir = '${Platform.pathSeparator}$dir';

diff --git a/packages/isar/pubspec.yaml b/packages/isar/pubspec.yaml
@@ -18,6 +18,6 @@ dependencies:
   meta: ^1.7.0
 
 dev_dependencies:
-  ffigen: ">=6.1.2 <8.0.0"
+  ffigen: "^7.0.0"
   test: ^1.21.1
   very_good_analysis: ^3.0.1
diff --git a/packages/isar_flutter_libs/pubspec.yaml b/packages/isar_flutter_libs/pubspec.yaml
@@ -14,7 +14,7 @@ dependencies:
     sdk: flutter
   isar: 
     version: 3.1.4
-    hosted: https://isar-community.dev/
+    hosted: https://isar-community.dev
 
 flutter:
   plugin:

diff --git a/packages/isar_flutter_libs/pubspec_overrides.yaml b/packages/isar_flutter_libs/pubspec_overrides.yaml
@@ -1,3 +1,3 @@
 dependency_overrides:
-  isar: 
-    path: ../isar
+ isar: 
+   path: ../isar