immich-app/isar
1
0
Fork 0
mirror of https://github.com/immich-app/isar.git synced 2026-09-30 13:23:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Tests fixes and small adjustments (#34)

Browse Source 
New pubspecs without local path references
This commit is contained in:
Vicente Russo
2024-03-27 14:25:08 -03:00
committed by GitHub
parent b75f93d88e
commit d10191a6fc
14 changed files with 108 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/release.yaml
+15 -7
View File
@@ -9,12 +9,18 @@ jobs:
verify_version: verify_version:
name: Verify version matches release name: Verify version matches release
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
sdk: [3.0.0]
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- uses: dart-lang/setup-dart@v1 - uses: subosito/flutter-action@v2
with:
flutter-version: ${{ vars.FLUTTER_VERSION }}
- name: Verify release version - name: Verify release version
run: | run: |
dart pub get flutter pub get
dart tool/verify_release_version.dart ${{ github.ref_name }} dart tool/verify_release_version.dart ${{ github.ref_name }}
working-directory: packages/isar working-directory: packages/isar
@@ -56,7 +62,7 @@ jobs:
permissions: permissions:
contents: write contents: write
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Prepare Build - name: Prepare Build
uses: ./.github/actions/prepare-build uses: ./.github/actions/prepare-build
- name: Set env - name: Set env
@@ -81,8 +87,10 @@ jobs:
needs: build_binaries needs: build_binaries
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- uses: subosito/flutter-action@v2 - uses: subosito/flutter-action@v2
with:
flutter-version: ${{ vars.FLUTTER_VERSION }}
- name: Build - name: Build
run: flutter build web --base-href /${{ github.ref_name }}/ run: flutter build web --base-href /${{ github.ref_name }}/
working-directory: packages/isar_inspector working-directory: packages/isar_inspector
@@ -90,7 +98,7 @@ jobs:
uses: JamesIves/github-pages-deploy-action@v4 uses: JamesIves/github-pages-deploy-action@v4
with: with:
folder: packages/isar_inspector/build/web folder: packages/isar_inspector/build/web
repository-name: isar/inspector repository-name: isar-community/inspector
token: ${{ secrets.TOKEN }} token: ${{ secrets.TOKEN }}
target-folder: ${{ github.ref_name }} target-folder: ${{ github.ref_name }}
clean: false clean: false
@@ -100,7 +108,7 @@ jobs:
# needs: build_inspector # needs: build_inspector
# runs-on: ubuntu-latest # runs-on: ubuntu-latest
# steps: # steps:
# - uses: actions/checkout@v3 # - uses: actions/checkout@v4
# - uses: subosito/flutter-action@v2 # - uses: subosito/flutter-action@v2
# - name: pub get # - name: pub get
# run: dart pub get # run: dart pub get
.github/workflows/test.yaml
+56 -20
View File
@@ -9,15 +9,26 @@ on:
- v3 - v3
jobs: 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: format:
name: Check formatting name: Check formatting
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Setup Flutter - name: Setup Flutter
uses: subosito/flutter-action@v2 uses: subosito/flutter-action@v2
with: with:
flutter-version: ${{ secrets.FLUTTER_VERSION }} flutter-version: ${{ vars.FLUTTER_VERSION }}
- name: Check formatting - name: Check formatting
run: dart format --set-exit-if-changed . run: dart format --set-exit-if-changed .
@@ -26,11 +37,11 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ false }} if: ${{ false }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Setup Flutter - name: Setup Flutter
uses: subosito/flutter-action@v2 uses: subosito/flutter-action@v2
with: with:
flutter-version: ${{ secrets.FLUTTER_VERSION }} flutter-version: ${{ vars.FLUTTER_VERSION }}
- run: flutter pub get - run: flutter pub get
working-directory: packages/isar working-directory: packages/isar
- run: flutter pub get - run: flutter pub get
@@ -39,6 +50,8 @@ jobs:
working-directory: packages/isar_generator working-directory: packages/isar_generator
- run: flutter pub get - run: flutter pub get
working-directory: packages/isar_inspector working-directory: packages/isar_inspector
- run: flutter pub get
working-directory: examples/pub
- run: | - run: |
flutter pub get flutter pub get
flutter pub run build_runner build flutter pub run build_runner build
@@ -56,8 +69,10 @@ jobs:
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps:
- run: echo "$OSTYPE" - run: echo "$OSTYPE"
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- uses: subosito/flutter-action@v2 - uses: subosito/flutter-action@v2
with:
flutter-version: ${{ vars.FLUTTER_VERSION }}
- name: Prepare Build - name: Prepare Build
uses: ./.github/actions/prepare-build uses: ./.github/actions/prepare-build
- name: Build Isar Core - name: Build Isar Core
@@ -73,8 +88,10 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ false }} if: ${{ false }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- uses: subosito/flutter-action@v2 - uses: subosito/flutter-action@v2
with:
flutter-version: ${{ vars.FLUTTER_VERSION }}
- name: Prepare Build - name: Prepare Build
uses: ./.github/actions/prepare-build uses: ./.github/actions/prepare-build
- name: Install valgrind and llvm - name: Install valgrind and llvm
@@ -99,8 +116,10 @@ jobs:
name: Code Coverage name: Code Coverage
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- uses: subosito/flutter-action@v2 - uses: subosito/flutter-action@v2
with:
flutter-version: ${{ vars.FLUTTER_VERSION }}
- name: Prepare Build - name: Prepare Build
uses: ./.github/actions/prepare-build uses: ./.github/actions/prepare-build
- name: Build Isar Core - name: Build Isar Core
@@ -134,8 +153,10 @@ jobs:
name: Generator Test name: Generator Test
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- uses: subosito/flutter-action@v2 - uses: subosito/flutter-action@v2
with:
flutter-version: ${{ vars.FLUTTER_VERSION }}
- name: Run Generator Unit tests - name: Run Generator Unit tests
run: | run: |
dart pub get dart pub get
@@ -146,12 +167,14 @@ jobs:
name: Integration Test iOS name: Integration Test iOS
runs-on: macos-latest runs-on: macos-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Start simulator - name: Start simulator
uses: futureware-tech/simulator-action@v2 uses: futureware-tech/simulator-action@v2
with: with:
model: iPhone 13 model: iPhone 13
- uses: subosito/flutter-action@v2 - uses: subosito/flutter-action@v2
with:
flutter-version: ${{ vars.FLUTTER_VERSION }}
- name: Prepare Build - name: Prepare Build
uses: ./.github/actions/prepare-build uses: ./.github/actions/prepare-build
- name: Build Isar Core - name: Build Isar Core
@@ -168,12 +191,14 @@ jobs:
name: Integration Test Android name: Integration Test Android
runs-on: macos-latest runs-on: macos-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- uses: actions/setup-java@v3 - uses: actions/setup-java@v3
with: with:
java-version: "11" java-version: "11"
distribution: "zulu" distribution: "zulu"
- uses: subosito/flutter-action@v2 - uses: subosito/flutter-action@v2
with:
flutter-version: ${{ vars.FLUTTER_VERSION }}
- name: Prepare Build - name: Prepare Build
uses: ./.github/actions/prepare-build uses: ./.github/actions/prepare-build
- name: Build Isar Core - name: Build Isar Core
@@ -200,10 +225,11 @@ jobs:
name: Integration Test macOS name: Integration Test macOS
runs-on: macos-latest runs-on: macos-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- uses: subosito/flutter-action@v2 - uses: subosito/flutter-action@v2
with: 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 - name: Prepare Build
uses: ./.github/actions/prepare-build uses: ./.github/actions/prepare-build
- name: Build Isar Core - name: Build Isar Core
@@ -215,7 +241,7 @@ jobs:
run: sh tool/prepare_tests.sh run: sh tool/prepare_tests.sh
- name: Run Flutter Driver tests - name: Run Flutter Driver tests
run: | run: |
flutter config --enable-macos-desktop flutter config --enable-macos-desktop
flutter test -d macos integration_test/integration_test.dart --dart-define STRESS=true flutter test -d macos integration_test/integration_test.dart --dart-define STRESS=true
working-directory: packages/isar_test working-directory: packages/isar_test
@@ -223,8 +249,10 @@ jobs:
name: Integration Test Linux name: Integration Test Linux
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- uses: subosito/flutter-action@v2 - uses: subosito/flutter-action@v2
with:
flutter-version: ${{ vars.FLUTTER_VERSION }}
- name: Prepare Build - name: Prepare Build
uses: ./.github/actions/prepare-build uses: ./.github/actions/prepare-build
- name: Install Linux requirements - name: Install Linux requirements
@@ -239,7 +267,7 @@ jobs:
run: sh tool/prepare_tests.sh run: sh tool/prepare_tests.sh
- name: Run Flutter Driver tests - name: Run Flutter Driver tests
run: | run: |
flutter config --enable-linux-desktop flutter config --enable-linux-desktop
flutter test -d linux integration_test/integration_test.dart --dart-define STRESS=true flutter test -d linux integration_test/integration_test.dart --dart-define STRESS=true
working-directory: packages/isar_test working-directory: packages/isar_test
@@ -248,8 +276,10 @@ jobs:
runs-on: windows-2019 runs-on: windows-2019
if: ${{ false }} if: ${{ false }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- uses: subosito/flutter-action@v2 - uses: subosito/flutter-action@v2
with:
flutter-version: ${{ vars.FLUTTER_VERSION }}
- name: Prepare Build - name: Prepare Build
uses: ./.github/actions/prepare-build uses: ./.github/actions/prepare-build
- name: Build Isar Core - name: Build Isar Core
@@ -260,7 +290,7 @@ jobs:
run: sh tool/prepare_tests.sh run: sh tool/prepare_tests.sh
- name: Run Flutter Driver tests - name: Run Flutter Driver tests
run: | run: |
flutter config --enable-windows-desktop flutter config --enable-windows-desktop
flutter test -d windows integration_test/integration_test.dart --dart-define STRESS=true flutter test -d windows integration_test/integration_test.dart --dart-define STRESS=true
working-directory: packages/isar_test working-directory: packages/isar_test
@@ -268,8 +298,10 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ false }} if: ${{ false }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- uses: subosito/flutter-action@v2 - uses: subosito/flutter-action@v2
with:
flutter-version: ${{ vars.FLUTTER_VERSION }}
- name: Install chromedricer - name: Install chromedricer
uses: nanasess/setup-chromedriver@v1 uses: nanasess/setup-chromedriver@v1
- name: Prepare chromedricer - name: Prepare chromedricer
@@ -287,8 +319,10 @@ jobs:
runs-on: macos-latest runs-on: macos-latest
if: ${{ false }} if: ${{ false }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- uses: subosito/flutter-action@v2 - uses: subosito/flutter-action@v2
with:
flutter-version: ${{ vars.FLUTTER_VERSION }}
- name: Prepare safaridricer - name: Prepare safaridricer
run: | run: |
sudo safaridriver --enable sudo safaridriver --enable
@@ -306,8 +340,10 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ false }} if: ${{ false }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- uses: subosito/flutter-action@v2 - uses: subosito/flutter-action@v2
with:
flutter-version: ${{ vars.FLUTTER_VERSION }}
- name: Install geckodriver - name: Install geckodriver
uses: browser-actions/setup-geckodriver@latest uses: browser-actions/setup-geckodriver@latest
- name: Prepare geckodriver - name: Prepare geckodriver
.github/workflows/testlab.yaml
+5 -3
View File
@@ -5,8 +5,10 @@ jobs:
name: Firebase Testlab Android name: Firebase Testlab Android
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- uses: subosito/flutter-action@v2 - uses: subosito/flutter-action@v2
with:
flutter-version: ${{ vars.FLUTTER_VERSION }}
- name: Prepare Build - name: Prepare Build
uses: ./.github/actions/prepare-build uses: ./.github/actions/prepare-build
- name: Build Isar Core arm64 - name: Build Isar Core arm64
@@ -36,7 +38,7 @@ jobs:
- name: Run tests - name: Run tests
run: | run: |
gcloud firebase test android run \ gcloud firebase test android run \
--project honeyy \ --project isar-community \
--type instrumentation \ --type instrumentation \
--timeout 5m \ --timeout 5m \
--device model=hammerhead,version=23 \ --device model=hammerhead,version=23 \
@@ -44,4 +46,4 @@ jobs:
--device model=cheetah,version=33 \ --device model=cheetah,version=33 \
--app build/app/outputs/apk/debug/app-debug.apk \ --app build/app/outputs/apk/debug/app-debug.apk \
--test build/app/outputs/apk/androidTest/debug/app-debug-androidTest.apk --test build/app/outputs/apk/androidTest/debug/app-debug-androidTest.apk
working-directory: packages/isar_test working-directory: packages/isar_test
Cargo.toml
+1
View File
@@ -1,4 +1,5 @@
[workspace] [workspace]
resolver = "2"
members = [ members = [
"packages/isar_core", "packages/isar_core",
"packages/isar_core_ffi", "packages/isar_core_ffi",
packages/isar/lib/src/native/bindings.dart
+5 -5
View File
@@ -2024,8 +2024,8 @@ class IsarCoreBindings {
} }
late final _isar_q_aggregate_long_resultPtr = _lookup< late final _isar_q_aggregate_long_resultPtr = _lookup<
ffi ffi.NativeFunction<
.NativeFunction<ffi.Int64 Function(ffi.Pointer<CAggregationResult>)>>( ffi.Int64 Function(ffi.Pointer<CAggregationResult>)>>(
'isar_q_aggregate_long_result'); 'isar_q_aggregate_long_result');
late final _isar_q_aggregate_long_result = _isar_q_aggregate_long_resultPtr late final _isar_q_aggregate_long_result = _isar_q_aggregate_long_resultPtr
.asFunction<int Function(ffi.Pointer<CAggregationResult>)>(); .asFunction<int Function(ffi.Pointer<CAggregationResult>)>();
@@ -2088,9 +2088,9 @@ class IsarCoreBindings {
} }
late final _isar_txn_finishPtr = _lookup< late final _isar_txn_finishPtr = _lookup<
ffi ffi.NativeFunction<
.NativeFunction<ffi.Int64 Function(ffi.Pointer<CIsarTxn>, ffi.Bool)>>( ffi.Int64 Function(
'isar_txn_finish'); ffi.Pointer<CIsarTxn>, ffi.Bool)>>('isar_txn_finish');
late final _isar_txn_finish = _isar_txn_finishPtr late final _isar_txn_finish = _isar_txn_finishPtr
.asFunction<int Function(ffi.Pointer<CIsarTxn>, bool)>(); .asFunction<int Function(ffi.Pointer<CIsarTxn>, bool)>();
packages/isar/lib/src/native/isar_core.dart
+5 -2
View File
@@ -37,7 +37,8 @@ const nullBool = IsarObject_NULL_BOOL;
const falseBool = IsarObject_FALSE_BOOL; const falseBool = IsarObject_FALSE_BOOL;
const trueBool = IsarObject_TRUE_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; bool _isarInitialized = false;
@@ -119,7 +120,9 @@ String _getLibraryDownloadPath(Map<Abi, String> libraries) {
if (Platform.script.path.isEmpty) { if (Platform.script.path.isEmpty) {
return name; 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) { if (!Platform.isWindows) {
// Not on windows, add leading platform path separator // Not on windows, add leading platform path separator
dir = '${Platform.pathSeparator}$dir'; dir = '${Platform.pathSeparator}$dir';
packages/isar/pubspec.yaml
+1 -1
View File
@@ -18,6 +18,6 @@ dependencies:
meta: ^1.7.0 meta: ^1.7.0
dev_dependencies: dev_dependencies:
ffigen: ">=6.1.2 <8.0.0" ffigen: "^7.0.0"
test: ^1.21.1 test: ^1.21.1
very_good_analysis: ^3.0.1 very_good_analysis: ^3.0.1
packages/isar_flutter_libs/pubspec.yaml
+1 -1
View File
@@ -14,7 +14,7 @@ dependencies:
sdk: flutter sdk: flutter
isar: isar:
version: 3.1.4 version: 3.1.4
hosted: https://isar-community.dev/ hosted: https://isar-community.dev
flutter: flutter:
plugin: plugin:
packages/isar_flutter_libs/pubspec_overrides.yaml
+2 -2
View File
@@ -1,3 +1,3 @@
dependency_overrides: dependency_overrides:
isar: isar:
path: ../isar path: ../isar
packages/isar_generator/pubspec.yaml
+1 -1
View File
@@ -16,7 +16,7 @@ dependencies:
glob: ^2.0.2 glob: ^2.0.2
isar: isar:
version: 3.1.4 version: 3.1.4
hosted: https://isar-community.dev/ hosted: https://isar-community.dev
path: ^1.8.1 path: ^1.8.1
source_gen: ^1.2.2 source_gen: ^1.2.2
xxh3: ^1.0.1 xxh3: ^1.0.1
packages/isar_generator/pubspec_overrides.yaml
+2 -2
View File
@@ -1,3 +1,3 @@
dependency_overrides: dependency_overrides:
isar: isar:
path: ../isar path: ../isar
packages/isar_inspector/pubspec.yaml
+1 -1
View File
@@ -17,7 +17,7 @@ dependencies:
google_fonts: 6.1.0 google_fonts: 6.1.0
isar: isar:
path: ../isar path: ../isar
vm_service: ^9.0.0 vm_service: ^11.0.0
web_socket_channel: ^2.2.0 web_socket_channel: ^2.2.0
dev_dependencies: dev_dependencies:
packages/isar_test/pubspec.yaml
+12 -6
View File
@@ -12,21 +12,27 @@ dependencies:
sdk: flutter sdk: flutter
integration_test: integration_test:
sdk: flutter sdk: flutter
intl: 0.18.0 intl: ^0.19.0
isar: any isar:
isar_flutter_libs: any version: any
hosted: https://isar-community.dev
isar_flutter_libs:
version: any
hosted: https://isar-community.dev
json_annotation: ^4.7.0 json_annotation: ^4.7.0
meta: ^1.8.0 meta: ^1.8.0
path: ^1.8.2 path: ^1.8.2
path_provider: ^2.0.10 path_provider: ^2.0.10
test: ^1.21.4 test: ^1.21.4
test_api: ^0.4.12 test_api: ^0.5.1
dev_dependencies: dev_dependencies:
build_runner: any build_runner: any
flutter_test: flutter_test:
sdk: flutter sdk: flutter
isar_generator: any isar_generator:
version: any
hosted: https://isar-community.dev
json_serializable: ^6.3.1 json_serializable: ^6.3.1
very_good_analysis: ^3.0.1 very_good_analysis: ^3.0.1
@@ -36,4 +42,4 @@ dependency_overrides:
isar_flutter_libs: isar_flutter_libs:
path: ../isar_flutter_libs path: ../isar_flutter_libs
isar_generator: isar_generator:
path: ../isar_generator path: ../isar_generator
packages/mdbx_sys/build.rs
+1 -1
View File
@@ -50,7 +50,7 @@ impl ParseCallbacks for Callbacks {
} }
const LIBMDBX_REPO: &str = "https://github.com/isar/libmdbx.git"; const LIBMDBX_REPO: &str = "https://github.com/isar/libmdbx.git";
const LIBMDBX_TAG: &str = "v0.12.4"; const LIBMDBX_TAG: &str = "v0.13.0";
fn main() { fn main() {
println!("cargo:rerun-if-changed=build.rs"); println!("cargo:rerun-if-changed=build.rs");