Skip to content

Commit

Permalink
VENOM-491: Use preconfigured flatpak image
Browse files Browse the repository at this point in the history
  • Loading branch information
naxuroqa committed Jan 23, 2019
1 parent 1943596 commit afa8ec3
Show file tree
Hide file tree
Showing 5 changed files with 145 additions and 118 deletions.
20 changes: 3 additions & 17 deletions .circleci/config.yml
Expand Up @@ -155,28 +155,14 @@ jobs:
- checkout
- run:
name: Start docker
command: docker run --privileged=true --name image -it -d --volume "$(pwd)":/opt/venom --workdir /opt/venom ubuntu:18.04
- run:
name: Install dependencies
command: |
docker exec image apt-get -qq update
docker exec image apt-get -qq install software-properties-common > /dev/null
docker exec image add-apt-repository ppa:alexlarsson/flatpak
docker exec image apt-get -qq update
docker exec image apt-get -qq install -y flatpak-builder > /dev/null
- run:
name: Install flatpak dependencies
command: |
docker exec image flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
docker exec image flatpak install -y flathub org.gnome.Sdk//3.28
docker exec image flatpak install -y flathub org.gnome.Platform//3.28
command: docker run --privileged=true --name image -it -d --volume "$(pwd)":/opt/venom --workdir /opt/venom flatpak/flatpak-builder:gnome-3-28
- restore_cache:
key: builder-cache
paths:
- .flatpak-builder
- run:
name: Build flatpak manifest dependencies
command: docker exec image flatpak-builder --stop-at=venom --repo=repo app com.github.naxuroqa.venom.yml
command: docker exec image flatpak-builder --stop-at=venom --repo=repo app com.github.naxuroqa.venom.json
- save_cache:
key: builder-cache
paths:
Expand All @@ -186,7 +172,7 @@ jobs:
command: |
docker exec image flatpak build app meson --prefix=/app _build
docker exec image flatpak build app ninja -C _build install
docker exec image flatpak-builder --finish-only --repo=repo app com.github.naxuroqa.venom.yml
docker exec image flatpak-builder --finish-only --repo=repo app com.github.naxuroqa.venom.json
docker exec image flatpak build-bundle repo "com.github.naxuroqa.venom-debug-build-${CIRCLE_BUILD_NUM}.x86_64.flatpak" --runtime-repo=https://dl.flathub.org/repo/flathub.flatpakrepo com.github.naxuroqa.venom
- run:
name: Prepare artifacts
Expand Down
14 changes: 3 additions & 11 deletions .travis.yml
Expand Up @@ -10,25 +10,17 @@ matrix:
- name: "Debian 10"
env: DOCKER_IMAGE=debian:buster
- name: "Flatpak"
env: DOCKER_IMAGE=ubuntu:18.04
env: DOCKER_IMAGE=flatpak/flatpak-builder:gnome-3-28
cache:
directories:
- .flatpak-builder
install:
- docker run --privileged=true --name image -it -d --volume "$(pwd)":/opt/venom --workdir /opt/venom $DOCKER_IMAGE
- docker exec image apt-get -qq update
- docker exec image apt-get -qq install software-properties-common > /dev/null
- docker exec image add-apt-repository ppa:alexlarsson/flatpak
- docker exec image apt-get -qq update
- docker exec image apt-get -qq install -y flatpak-builder > /dev/null
- docker exec image flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
- docker exec image flatpak install -y flathub org.gnome.Sdk//3.28
- docker exec image flatpak install -y flathub org.gnome.Platform//3.28
script:
- docker exec image flatpak-builder --stop-at=venom --repo=repo app com.github.naxuroqa.venom.yml
- docker exec image flatpak-builder --stop-at=venom --repo=repo app com.github.naxuroqa.venom.json
- docker exec image flatpak build app meson --prefix=/app _build
- docker exec image flatpak build app ninja -C _build install
- docker exec image flatpak-builder --finish-only --repo=repo app com.github.naxuroqa.venom.yml
- docker exec image flatpak-builder --finish-only --repo=repo app com.github.naxuroqa.venom.json
- docker exec image flatpak build-bundle repo com.github.naxuroqa.venom.x86_64.flatpak --runtime-repo=https://dl.flathub.org/repo/flathub.flatpakrepo com.github.naxuroqa.venom

cache:
Expand Down
137 changes: 137 additions & 0 deletions com.github.naxuroqa.venom.json
@@ -0,0 +1,137 @@
{
"app-id": "com.github.naxuroqa.venom",
"runtime": "org.gnome.Platform",
"runtime-version": "3.28",
"sdk": "org.gnome.Sdk",
"command": "venom",
"copy-icon": true,
"finish-args": [
"--share=network",
"--socket=x11",
"--share=ipc",
"--socket=wayland",
"--device=dri",
"--socket=pulseaudio",
"--talk-name=ca.desrt.dconf",
"--talk-name=org.freedesktop.Notifications",
"--filesystem=xdg-data/pixmaps/faces:ro",
"--filesystem=xdg-download",
"--device=all"
],
"cleanup-commands": [
"rm -rf /app/bin/{DHT_bootstrap,gspell-app1,enchant*}",
"rm -rf /app/include",
"rm -rf /app/lib/{*.a,*.la,girepository-1.0,pkgconfig}",
"rm -rf /app/lib/enchant-2/{*.a,*.la}",
"rm -rf /app/share/{vala,man,gir-1.0}"
],
"build-options": {
"cflags": "-O3 -DSQLITE_HAS_CODEC",
"cxxflags": "-O3"
},
"modules": [
{
"name": "sqlcipher",
"rm-configure": true,
"config-opts": [
"--enable-tempstore=yes",
"--disable-tcl"
],
"sources": [
{
"type": "git",
"url": "https://github.com/sqlcipher/sqlcipher",
"tag": "v4.0.1",
"commit": "27d58453c6e56c3dd85e02bca379161bc69c746a",
"disable-fsckobjects": true
},
{
"type": "script",
"dest-filename": "autogen.sh",
"commands": [
"AUTOMAKE=\"automake --foreign\" autoreconf -vfi"
]
}
]
},
{
"name": "libsodium",
"sources": [
{
"type": "git",
"url": "https://github.com/jedisct1/libsodium",
"tag": "1.0.17",
"commit": "b732443c442239c2e0184820e9b23cca0de0828c"
}
]
},
{
"name": "toxcore",
"buildsystem": "cmake",
"config-opts": [
"-DCMAKE_BUILD_TYPE=Release",
"-DENABLE_STATIC=OFF"
],
"sources": [
{
"type": "git",
"url": "https://github.com/toktok/c-toxcore",
"tag": "v0.2.9",
"commit": "98b754e1f22220f10196760389371dba6d139c6f"
}
]
},
{
"name": "libgee",
"build-options": {
"env": {
"PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR": "/app/share/gir-1.0",
"PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR": "/app/lib/girepository-1.0"
}
},
"sources": [
{
"type": "git",
"url": "https://gitlab.gnome.org/GNOME/libgee",
"tag": "0.20.1",
"commit": "57e4c8a08d61ab77bbec310a3a1621e6bf3111cb"
}
]
},
{
"name": "enchant",
"sources": [
{
"type": "archive",
"url": "https://github.com/AbiWord/enchant/releases/download/v2.2.3/enchant-2.2.3.tar.gz",
"sha256": "abd8e915675cff54c0d4da5029d95c528362266557c61c7149d53fa069b8076d"
}
]
},
{
"name": "gspell",
"sources": [
{
"type": "git",
"url": "https://gitlab.gnome.org/GNOME/gspell",
"tag": "1.8.1",
"commit": "ba03499234037861e01ce1e83075e8a32b9790f3"
}
]
},
{
"name": "venom",
"builddir": true,
"buildsystem": "meson",
"config-opts": [
"--buildtype=release"
],
"sources": [
{
"type": "git",
"url": "https://github.com/naxuroqa/Venom"
}
]
}
]
}
88 changes: 0 additions & 88 deletions com.github.naxuroqa.venom.yml

This file was deleted.

4 changes: 2 additions & 2 deletions scripts/flatpak-bundle.sh
@@ -1,8 +1,8 @@
#! /bin/sh
set -e

flatpak-builder --stop-at=venom --repo=repo app com.github.naxuroqa.venom.yml
flatpak-builder --stop-at=venom --repo=repo app com.github.naxuroqa.venom.json
flatpak build app meson --prefix=/app _build
flatpak build app ninja -C _build install
flatpak-builder --finish-only --repo=repo app com.github.naxuroqa.venom.yml
flatpak-builder --finish-only --repo=repo app com.github.naxuroqa.venom.json
flatpak build-bundle repo com.github.naxuroqa.venom.x86_64.flatpak --runtime-repo=https://dl.flathub.org/repo/flathub.flatpakrepo com.github.naxuroqa.venom

0 comments on commit afa8ec3

Please sign in to comment.