Skip to content

Commit

Permalink
upgrade tauri dependencies to 1.5
Browse files Browse the repository at this point in the history
  • Loading branch information
vemonet committed Nov 22, 2023
1 parent cb616f6 commit f4c3a3c
Show file tree
Hide file tree
Showing 9 changed files with 804 additions and 640 deletions.
17 changes: 13 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
options: --privileged

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
repository: flathub/io.github.vemonet.EmojiMart
ref: dev
Expand All @@ -71,7 +71,7 @@ jobs:
- name: Setup node
uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20

- name: Update package version in flatpak manifest
# env:
Expand All @@ -93,8 +93,17 @@ jobs:
manifest-path: io.github.vemonet.EmojiMart.yml
cache-key: flatpak-builder-${{ github.sha }}

- uses: actions/upload-artifact@v3
with:
name: EmojiMart.flatpak
path: EmojiMart.flatpak

- name: Update Release
if: github.event_name == 'release'
uses: softprops/action-gh-release@v1
with:
files: EmojiMart.flatpak
tag_name: v${{ github.env.PACKAGE_VERSION }}
files: |
EmojiMart.flatpak
# EmojiMart-.flatpak
# Tag auto pick from release trigger env
# tag_name: v${{ github.env.PACKAGE_VERSION }}
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,5 @@ src-tauri/target/
ydotool

/cldr-json/
/emoji-mart/
/emoji-mart/
io.github.vemonet.EmojiMart/
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ install:
yarn
rustup component add rustfmt

# Install ydotool to auto-paste on wayland
install-wayland:
git clone https://github.com/vemonet/ydotool -b no-scdoc
mkdir ydotool/build
Expand Down
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ Inspired by:
- [ ] Check if working properly on MacOS
- [ ] Check if working properly on Windows
- [ ] Add auto-paste on Windows and MacOS when the compatibility between Enigo and Tauri is resolved (cf. https://github.com/enigo-rs/enigo/issues/15 and https://github.com/tauri-apps/tauri/issues/6421)
- [ ] Improve persistence https://aptabase.com/blog/persistent-state-tauri-apps

## 🛠️ Development

Expand All @@ -167,7 +168,10 @@ See pre-requesites to run tauri: https://tauri.app/v1/guides/getting-started/pre
Additional dependencies for Linux to enable auto-paste on x11:

```bash
sudo dnf install libX11-devel libxdo-devel
# On debian/ubuntu
sudo apt install -y libx11-dev libxdo-dev libsoup2.4-dev libgdk-pixbuf-2.0-dev libpango1.0-dev libgtk-3-dev libatk1.0-dev libjavascriptcoregtk-4.0-dev libwebkit2gtk-4.0-dev
# On fedora
sudo dnf install -y libX11-devel libxdo-devel
```

Install dependencies:
Expand Down Expand Up @@ -227,6 +231,7 @@ To automatically upgrade dependencies with `yarn` and `cargo` you can run:

```bash
make upgrade
yarn upgrade-interactive --latest
```

### 🏷️ New release
Expand Down
Loading

0 comments on commit f4c3a3c

Please sign in to comment.