Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6f83708511 | ||
|
|
a63365b6b9 | ||
|
|
c4a79926c7 | ||
|
|
64f2ce11a4 | ||
|
|
226f65b0e4 |
8
.github/workflows/tauri.yml
vendored
8
.github/workflows/tauri.yml
vendored
@@ -31,7 +31,7 @@ jobs:
|
|||||||
- name: Install tauri dependencies
|
- name: Install tauri dependencies
|
||||||
run: npm ci
|
run: npm ci
|
||||||
- name: Build desktop app with Tauri
|
- name: Build desktop app with Tauri
|
||||||
uses: tauri-apps/tauri-action@v0.3.1
|
uses: tauri-apps/tauri-action@v0.4.4
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
|
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
|
||||||
@@ -90,13 +90,13 @@ jobs:
|
|||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
|
sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf
|
||||||
- name: Install cinny dependencies
|
- name: Install cinny dependencies
|
||||||
run: cd cinny && npm ci
|
run: cd cinny && npm ci
|
||||||
- name: Install tauri dependencies
|
- name: Install tauri dependencies
|
||||||
run: npm ci
|
run: npm ci
|
||||||
- name: Build desktop app with Tauri
|
- name: Build desktop app with Tauri
|
||||||
uses: tauri-apps/tauri-action@v0.3.1
|
uses: tauri-apps/tauri-action@v0.4.4
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
|
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
|
||||||
@@ -151,7 +151,7 @@ jobs:
|
|||||||
- name: Install tauri dependencies
|
- name: Install tauri dependencies
|
||||||
run: npm ci
|
run: npm ci
|
||||||
- name: Build desktop app with Tauri
|
- name: Build desktop app with Tauri
|
||||||
uses: tauri-apps/tauri-action@v0.3.1
|
uses: tauri-apps/tauri-action@v0.4.4
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
|
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
|
||||||
|
|||||||
2
.github/workflows/test.yml
vendored
2
.github/workflows/test.yml
vendored
@@ -35,6 +35,6 @@ jobs:
|
|||||||
- name: Install tauri dependencies
|
- name: Install tauri dependencies
|
||||||
run: npm ci
|
run: npm ci
|
||||||
- name: Build desktop app with Tauri
|
- name: Build desktop app with Tauri
|
||||||
uses: tauri-apps/tauri-action@v0.3.1
|
uses: tauri-apps/tauri-action@v0.4.4
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
@@ -27,7 +27,7 @@ Firstly, to setup Rust, NodeJS and build tools follow [Tauri documentation](http
|
|||||||
|
|
||||||
Now, to setup development locally run the following commands:
|
Now, to setup development locally run the following commands:
|
||||||
* `git clone --recursive https://github.com/cinnyapp/cinny-desktop.git`
|
* `git clone --recursive https://github.com/cinnyapp/cinny-desktop.git`
|
||||||
* `cd cinny`
|
* `cd cinny-desktop/cinny`
|
||||||
* `npm ci`
|
* `npm ci`
|
||||||
* `cd ..`
|
* `cd ..`
|
||||||
* `npm ci`
|
* `npm ci`
|
||||||
|
|||||||
4
package-lock.json
generated
4
package-lock.json
generated
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "cinny",
|
"name": "cinny",
|
||||||
"version": "3.2.0",
|
"version": "3.2.1",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "cinny",
|
"name": "cinny",
|
||||||
"version": "3.2.0",
|
"version": "3.2.1",
|
||||||
"license": "AGPL-3.0-only",
|
"license": "AGPL-3.0-only",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@tauri-apps/api": "1.5.1"
|
"@tauri-apps/api": "1.5.1"
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "cinny",
|
"name": "cinny",
|
||||||
"version": "3.2.0",
|
"version": "3.2.1",
|
||||||
"description": "Yet another matrix client",
|
"description": "Yet another matrix client",
|
||||||
"main": "index.js",
|
"main": "index.js",
|
||||||
"engines": {
|
"engines": {
|
||||||
|
|||||||
6
src-tauri/Cargo.lock
generated
6
src-tauri/Cargo.lock
generated
@@ -424,7 +424,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cinny"
|
name = "cinny"
|
||||||
version = "3.2.0"
|
version = "3.2.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
@@ -2933,9 +2933,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serde_json"
|
name = "serde_json"
|
||||||
version = "1.0.107"
|
version = "1.0.108"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
|
checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"itoa 1.0.4",
|
"itoa 1.0.4",
|
||||||
"ryu",
|
"ryu",
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
[package]
|
[package]
|
||||||
name = "cinny"
|
name = "cinny"
|
||||||
version = "3.2.0"
|
version = "3.2.1"
|
||||||
description = "Yet another matrix client"
|
description = "Yet another matrix client"
|
||||||
authors = ["Ajay Bura"]
|
authors = ["Ajay Bura"]
|
||||||
license = "AGPL-3.0-only"
|
license = "AGPL-3.0-only"
|
||||||
@@ -15,8 +15,8 @@ rust-version = "1.61"
|
|||||||
tauri-build = { version = "1.5.0", features = [] }
|
tauri-build = { version = "1.5.0", features = [] }
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
serde_json = "1.0.91"
|
serde_json = "1.0.108"
|
||||||
serde = { version = "1.0.147", features = ["derive"] }
|
serde = { version = "1.0.190", features = ["derive"] }
|
||||||
tauri = { version = "1.5.2", features = ["api-all", "devtools", "system-tray", "updater"] }
|
tauri = { version = "1.5.2", features = ["api-all", "devtools", "system-tray", "updater"] }
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"package": {
|
"package": {
|
||||||
"productName": "Cinny",
|
"productName": "Cinny",
|
||||||
"version": "3.2.0"
|
"version": "3.2.1"
|
||||||
},
|
},
|
||||||
"build": {
|
"build": {
|
||||||
"distDir": "../cinny/dist",
|
"distDir": "../cinny/dist",
|
||||||
|
|||||||
Reference in New Issue
Block a user