Skip to content

Commit

Permalink
Merge pull request #107 from tom-james-watson/release-4-0-0
Browse files Browse the repository at this point in the history
bump to 4.0.0
  • Loading branch information
tom-james-watson authored Jun 20, 2023
2 parents 454db1e + ef35472 commit 33723d3
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 11 deletions.
24 changes: 15 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`:

Expand All @@ -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:

Expand All @@ -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:

Expand All @@ -186,17 +193,16 @@ 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).

Flathub builds can be monitored at [buildbot.flathub.org/#/apps/com.tomjwatson.Emote](https://buildbot.flathub.org/#/apps/com.tomjwatson.Emote)

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)

Expand All @@ -220,7 +226,7 @@ Clean the cache:
make snap-clean
```

**Publishing**
#### Publishing

First, ensure a git tag for the current version has been pushed.

Expand All @@ -236,6 +242,6 @@ Push the packaged snap to the `edge` channel on the snap store.
snapcraft push --release=edge <path to .snap>
```

### 🤝 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 🫠.
5 changes: 5 additions & 0 deletions flatpak/com.tomjwatson.Emote.metainfo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@
</screenshots>

<releases>
<release type="stable" version="4.0.0" date="2023-06-20T00:00:00Z">
<description>
<p>Stable flatpak release</p>
</description>
</release>
<release type="stable" version="3.1.0" date="2023-04-01T00:00:00Z">
<description>
<p>First release on Flathub</p>
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
project('emote',
version: '3.1.0',
version: '4.0.0',
meson_version: '>= 0.50.0',
default_options: [ 'warning_level=1', ],
)
Expand Down
2 changes: 1 addition & 1 deletion snap/snapcraft.yaml
Original file line number Diff line number Diff line change
@@ -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: |
Expand Down

0 comments on commit 33723d3

Please sign in to comment.