From 1f3f535b58b1e6c833d9e0ac35c762c91d86fe77 Mon Sep 17 00:00:00 2001 From: Christian Pauly Date: Tue, 6 Oct 2020 16:31:52 +0200 Subject: [PATCH] fix: Build Linux CI --- .gitignore | 1 + .gitlab-ci.yml | 25 +++++++++++-------------- snap/snapcraft.yaml | 37 ------------------------------------- 3 files changed, 12 insertions(+), 51 deletions(-) delete mode 100644 snap/snapcraft.yaml diff --git a/.gitignore b/.gitignore index bee4c81ae..e0598155f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ *.log *.pyc *.swp +*.snap .DS_Store .atom/ .buildlog/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ea0ca7ce4..61adb5854 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -181,23 +181,20 @@ pages: - public only: - main - -snap:publish-candidate: - stage: publish - image: "cibuilds/snapcraft:core18" - only: - - main + +build_linux: + stage: coverage script: - - snapcraft - - echo $SNAPCRAFT_LOGIN_FILE | base64 --decode --ignore-garbage > snapcraft.login - - snapcraft login --with snapcraft.login - - snapcraft push --release=candidate *.snap - - snapcraft logout + - flutter channel dev + - flutter upgrade + - flutter config --enable-linux-desktop + - flutter build linux --release artifacts: - paths: - - './*.snap' when: on_success - expire_in: 1 week + paths: + - build/linux/release/bundle/ + only: + - main snap:publish: stage: publish diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml deleted file mode 100644 index f235933fe..000000000 --- a/snap/snapcraft.yaml +++ /dev/null @@ -1,37 +0,0 @@ -name: fluffychat -version: 0.1.0 -summary: Chat with your friends. -description: Chat with your friends. -icon: assets/logo.png -confinement: strict -base: core18 -grade: stable - -apps: - fluffychat: - command: fluffychat - extensions: [flutter-dev] - plugs: - - network - - home - -parts: - olm: - source: . - source-type: git - plugin: cmake - build-packages: - - build-essential - stage-packages: - - libsqlite3-0 - override-build: | - if cd olm; then git pull; else git clone https://gitlab.matrix.org/matrix-org/olm.git; fi - cd olm - cmake . -Bbuild - cmake --build build - sudo make install - fluffychat: - source: . - plugin: flutter - flutter-target: lib/main.dart - after: [olm]