From e25dc91795689a9399a8df7944415910896f363a Mon Sep 17 00:00:00 2001 From: Tom Watson Date: Tue, 20 Jun 2023 12:08:31 +0200 Subject: [PATCH 1/3] bump to 4.0.0 --- flatpak/com.tomjwatson.Emote.metainfo.xml | 5 +++++ meson.build | 2 +- snap/snapcraft.yaml | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/flatpak/com.tomjwatson.Emote.metainfo.xml b/flatpak/com.tomjwatson.Emote.metainfo.xml index 6a75482..cb26870 100644 --- a/flatpak/com.tomjwatson.Emote.metainfo.xml +++ b/flatpak/com.tomjwatson.Emote.metainfo.xml @@ -52,6 +52,11 @@

First release on Flathub

+ + +

Stable flatpak release

+ + diff --git a/meson.build b/meson.build index caddc0d..de795a9 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('emote', - version: '3.1.0', + version: '4.0.0', meson_version: '>= 0.50.0', default_options: [ 'warning_level=1', ], ) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 2f48630..4c2511d 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,5 +1,5 @@ name: emote -version: '3.1.0' +version: '4.0.0' license: GPL-3.0+ summary: Modern emoji picker built on GTK3 description: | From 527fe598b167d7e2be003ef5ecd5e8d319ff3674 Mon Sep 17 00:00:00 2001 From: Tom Watson Date: Tue, 20 Jun 2023 12:15:55 +0200 Subject: [PATCH 2/3] fix release order --- flatpak/com.tomjwatson.Emote.metainfo.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flatpak/com.tomjwatson.Emote.metainfo.xml b/flatpak/com.tomjwatson.Emote.metainfo.xml index cb26870..b021d60 100644 --- a/flatpak/com.tomjwatson.Emote.metainfo.xml +++ b/flatpak/com.tomjwatson.Emote.metainfo.xml @@ -47,14 +47,14 @@ - + -

First release on Flathub

+

Stable flatpak release

 - + -

Stable flatpak release

+

First release on Flathub

 From ef354729872f44d257bdd87b534560ad2a6f560a Mon Sep 17 00:00:00 2001 From: Tom Watson Date: Tue, 20 Jun 2023 12:24:29 +0200 Subject: [PATCH 3/3] update readme with new version instructions --- README.md | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index d9bdbed..cd123b1 100644 --- a/README.md +++ b/README.md @@ -134,11 +134,18 @@ Launch app in debug mode with interactive inspector: make dev-debug ``` +## 🚢 Publishing + +### Releasing a new version + +1. Bump the version number in `snapcraft.yaml` for snap and in `meson.build` for flatpak. +2. Add a release entry to the `com.tomjwatson.Emote.metainfo.xml`. + ### 📦️ Package with Flatpak To develop locally you will need to have [`flatpak`](https://flatpak.org/setup/) installed. -**Install:** +#### Install Install `flatpak-builder`, the GNOME SDK, and `flatpak-pip-generator`: @@ -152,7 +159,7 @@ Optionally re-generate the `flatpak/python3-requirements.json` if the dependenci make flatpak-requirements ``` -**Build:** +#### Build Build the flatpak package and install it locally: @@ -166,7 +173,7 @@ Run Emote with flatpak (can also be done from the desktop entry): flatpak run com.tomjwatson.Emote ``` -**Debug**: +#### Debug In case you are facing issues with the cache not properly updating, or need to reset user data, you can clean the cache with: @@ -186,7 +193,7 @@ Run the command below if you want to access inside the containerized flatpak app flatpak run --command=sh --devel com.tomjwatson.Emote ``` -**Publish:** +#### Publish to Flathub Emote is published to Flathub using the repository [github.com/flathub/com.tomjwatson.Emote](https://github.com/flathub/com.tomjwatson.Emote). @@ -194,9 +201,8 @@ Flathub builds can be monitored at [buildbot.flathub.org/#/apps/com.tomjwatson.E To update the version published to Flathub: -1. Change the version in the source code: `snap/snapcraft.yaml` for Snap, the `meson.build` for Flatpak, and add the corresponding release notes to the `flatpak/com.tomjwatson.Emote.metainfo.xml` -2. In the [`com.tomjwatson.Emote.yml` manifest](https://github.com/flathub/com.tomjwatson.Emote/blob/master/com.tomjwatson.Emote.yml#L66) of the flathub/com.tomjwatson.Emote repo: change the commit hash to the commit of the Emote repository you want to publish -3. Flathub checks the GitHub repo every few minutes, and will start a build if a change as been detected, if the build succeed it is published automatically after 3 hours. You can use the [Flathub BuildBot web UI](https://buildbot.flathub.org/#/apps/com.tomjwatson.Emote) to monitor, start or publish builds manually (click the Publish button at the top of a successful build page). +1. In the [`com.tomjwatson.Emote.yml` manifest](https://github.com/flathub/com.tomjwatson.Emote/blob/master/com.tomjwatson.Emote.yml#L66) of the flathub/com.tomjwatson.Emote repo: change the commit hash to the commit of the Emote repository you want to publish +2. Flathub checks the GitHub repo every few minutes, and will start a build if a change as been detected, if the build succeed it is published automatically after 3 hours. You can use the [Flathub BuildBot web UI](https://buildbot.flathub.org/#/apps/com.tomjwatson.Emote) to monitor, start or publish builds manually (click the Publish button at the top of a successful build page). More documentation for maintaining a Flathub package is available at [docs.flathub.org/docs/for-app-authors/maintanance](https://docs.flathub.org/docs/for-app-authors/maintanance#buildbot) @@ -220,7 +226,7 @@ Clean the cache: make snap-clean ``` -**Publishing** +#### Publishing First, ensure a git tag for the current version has been pushed. @@ -236,6 +242,6 @@ Push the packaged snap to the `edge` channel on the snap store. snapcraft push --release=edge ``` -### 🤝 Attribution +## 🤝 Attribution Emoji data is sourced from https://raw.githubusercontent.com/hfg-gmuend/openmoji/master/data/openmoji.csv which is compiled by the lovely people at https://openmoji.org 🫠.