diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a1c1a716..04702d8f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,9 +1,8 @@ variables: - FLUTTER_VERSION: 3.3.9 + FLUTTER_VERSION: 3.3.10 image: name: cirrusci/flutter:${FLUTTER_VERSION} - pull_policy: if-not-present .shared_windows_runners: tags: @@ -22,16 +21,12 @@ code_analyze: artifacts: reports: codequality: code-quality-report.json - tags: - - docker - - famedly + widget_test: stage: test script: [ flutter test ] - tags: - - docker - - famedly + # the basic integration test configuration testing FLOSS builds on Synapse integration_test: @@ -44,8 +39,8 @@ integration_test: matrix: - HOMESERVER_IMPLEMENTATION: - synapse - - dendrite - - conduit + #- dendrite + #- conduit variables: # activate container-to-container networking FF_NETWORK_PER_BUILD: "true" @@ -97,7 +92,7 @@ integration_test: artifacts: # extending the default tests to test the Google-flavored builds -integration_test_proprietary: +.integration_test_proprietary: extends: integration_test script: # start AVD and keep running in background @@ -107,7 +102,7 @@ integration_test_proprietary: - scrcpy --no-display --record video.mkv & - flutter test integration_test --dart-define=HOMESERVER=$HOMESERVER --dart-define=USER1_NAME=$USER1_NAME --dart-define=USER2_NAME=$USER2_NAME --dart-define=USER1_PW=$USER1_PW --dart-define=USER2_PW=$USER2_PW || ( sleep 10 && exit 1 ) -release_mode_launches: +.release_mode_launches: parallel: matrix: - FLAVOR: @@ -138,9 +133,7 @@ build_web: artifacts: paths: - build/web/ - tags: - - docker - - famedly + # yes, we *do* build a Windows DLL on Linux. More reliable. build_olm_windows: @@ -192,9 +185,7 @@ build_android_debug: except: - main - tags - tags: - - docker - - famedly + build_android_apk: stage: build @@ -206,9 +197,7 @@ build_android_apk: when: on_success paths: - build/android/app-release.apk - tags: - - docker - - famedly + only: - main - tags @@ -224,9 +213,7 @@ deploy_playstore_internal: paths: - build/android/app-release.aab resource_group: playstore_release - tags: - - docker - - famedly + only: - main @@ -245,9 +232,7 @@ fdroid_repo: needs: - "build_android_apk" resource_group: playstore_release - tags: - - docker - - famedly + allow_failure: true only: - main @@ -286,9 +271,7 @@ build_linux_x86: sudo apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install keyboard-configuration -y && sudo apt-get install curl clang cmake ninja-build pkg-config libgtk-3-dev libblkid-dev liblzma-dev libjsoncpp-dev cmake-data libsecret-1-dev libsecret-1-0 librhash0 -y, ] script: [ ./scripts/build-linux.sh ] - tags: - - docker - - famedly + artifacts: when: on_success paths: @@ -337,9 +320,7 @@ update_dependencies: .release: stage: deploy image: curlimages/curl:latest - tags: - - docker - - famedly + rules: - if: '$CI_COMMIT_TAG =~ /^v\d+\.\d+\.\d+$/' - if: '$CI_COMMIT_TAG =~ /^rc\d+\.\d+\.\d+-\d+$/'