Merge branch 'braid/less-tests' into 'main'

refactor: disable some redundant tests

See merge request famedly/fluffychat!1075
This commit is contained in:
Krille 2023-01-13 09:45:09 +00:00
commit 1f71227221

View File

@ -74,6 +74,9 @@ integration_test:
- ffmpeg -i video.mkv -vf scale=iw/2:-2 -crf 40 -b:v 2000k -preset fast video.mp4 || true - ffmpeg -i video.mkv -vf scale=iw/2:-2 -crf 40 -b:v 2000k -preset fast video.mp4 || true
timeout: 30m timeout: 30m
retry: 2 retry: 2
rules:
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
when: always
artifacts: artifacts:
when: always when: always
paths: paths:
@ -88,6 +91,10 @@ integration_test:
.integration_test_linux: .integration_test_linux:
image: cirrusci/flutter:${FLUTTER_VERSION} image: cirrusci/flutter:${FLUTTER_VERSION}
extends: integration_test extends: integration_test
parallel:
matrix:
- HOMESERVER_IMPLEMENTATION:
- conduit
script: script:
- apt-get update - apt-get update
- apt-get install -y clang cmake ninja-build pkg-config libgtk-3-dev liblzma-dev libsecret-1-dev libjsoncpp-dev - apt-get install -y clang cmake ninja-build pkg-config libgtk-3-dev liblzma-dev libsecret-1-dev libjsoncpp-dev
@ -99,6 +106,10 @@ integration_test:
# extending the default tests to test the Google-flavored builds # extending the default tests to test the Google-flavored builds
integration_test_proprietary: integration_test_proprietary:
extends: integration_test extends: integration_test
parallel:
matrix:
- HOMESERVER_IMPLEMENTATION:
- conduit
script: script:
# start AVD and keep running in background # start AVD and keep running in background
- scripts/integration-start-avd.sh & - scripts/integration-start-avd.sh &