re-add changes lost by rebase

This commit is contained in:
Paul Sajna 2024-04-01 12:37:53 -07:00
parent d79745f736
commit 560127d669

View File

@ -40,16 +40,13 @@ build_macos:
build_linux_amd64_bundle: build_linux_amd64_bundle:
tags: tags:
- saas-linux-medium-amd64 - saas-linux-medium-amd64
image: ghcr.io/cirruslabs/flutter:3.19.0 image: ghcr.io/cirruslabs/flutter:3.19.4
stage: build stage: build
script: script:
- apt-get update - apt-get update
- apt-get install -y --no-install-recommends cmake ninja-build clang build-essential pkg-config libgtk-3-dev liblzma-dev lcov rustc cargo - apt-get install -y --no-install-recommends cmake ninja-build clang build-essential pkg-config libgtk-3-dev liblzma-dev lcov rustc cargo
- flutter config --enable-linux-desktop - flutter config --enable-linux-desktop
- git clone https://gitlab.com/veilid/veilid.git ../veilid - git clone https://gitlab.com/veilid/veilid.git ../veilid
- ../veilid/scripts/earthly/install_capnproto.sh
- ../veilid/scripts/earthly/install_protoc.sh
- dart pub get
- flutter build linux - flutter build linux
artifacts: artifacts:
paths: paths:
@ -65,7 +62,7 @@ build_linux_amd64_flatpak:
script: script:
- apt-get update - apt-get update
- apt-get install -y --no-install-recommends flatpak flatpak-builder gnupg2 elfutils ca-certificates - apt-get install -y --no-install-recommends flatpak flatpak-builder gnupg2 elfutils ca-certificates
- flatpak remote-add --no-gpg-verify --if-not-exists flathub http://flathub.org/repo/flathub.flatpakrepo - flatpak remote-add --no-gpg-verify --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
- flatpak install -y --noninteractive org.gnome.Sdk/x86_64/45 org.gnome.Platform/x86_64/45 app/org.flathub.flatpak-external-data-checker/x86_64/stable org.freedesktop.appstream-glib - flatpak install -y --noninteractive org.gnome.Sdk/x86_64/45 org.gnome.Platform/x86_64/45 app/org.flathub.flatpak-external-data-checker/x86_64/stable org.freedesktop.appstream-glib
- pushd flatpak/ - pushd flatpak/
- flatpak-builder --force-clean build-dir com.veilid.veilidchat.yml --repo=repo - flatpak-builder --force-clean build-dir com.veilid.veilidchat.yml --repo=repo