From c8bfc08e4d8014f5fe134292c2cd78452baa45f8 Mon Sep 17 00:00:00 2001 From: Uwe <13865709+greenrobot-team@users.noreply.github.com> Date: Tue, 1 Oct 2024 15:09:42 +0200 Subject: [PATCH] install.sh: never install the C library by default --- .github/workflows/dart.yml | 2 +- .gitlab-ci.yml | 4 ++-- install.sh | 6 ------ 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 710d0d44..dcb82995 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -26,7 +26,7 @@ jobs: with: sdk: 3.5.2 - name: Install ObjectBox C library - run: ./install.sh + run: ./install.sh --install # Install globally for generator integration tests - name: Integration test run: ./generator/test.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bcdef1e4..a3fe8be0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -59,7 +59,7 @@ test-generator:linux:x64: tags: [ x64, linux, docker ] image: dart:$DART_VERSION script: - - ./install.sh + - ./install.sh --install # Install globally for generator integration tests - ./generator/test.sh # Runs generator and objectbox unit tests. @@ -67,13 +67,13 @@ test-generator:linux:x64: extends: .cache stage: test script: - - ./install.sh # Generator tests - cd generator - dart pub get - dart test # ObjectBox tests - cd ../objectbox_test + - ../install.sh - dart pub get - dart run build_runner build # Set concurrency=1 to run only one test suite (== test file) at a time. diff --git a/install.sh b/install.sh index 48793dea..7ca187dd 100755 --- a/install.sh +++ b/install.sh @@ -9,10 +9,4 @@ cLibVersion=4.0.0 os=$(uname) cLibArgs="$*" -# if there's no tty this is probably part of a docker build - therefore we install the c-api explicitly -if [[ "$os" != MINGW* ]] && [[ "$os" != CYGWIN* ]] && [[ "$cLibArgs" != *"--install"* ]]; then - tty -s || cLibArgs="${cLibArgs} --install" -fi - - bash <(curl -s https://raw.githubusercontent.com/objectbox/objectbox-c/main/download.sh) ${cLibArgs} ${cLibVersion}