Skip to content

Commit

Permalink
Merge pull request #1 from ErickJ3/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
ErickJ3 authored Nov 22, 2024
2 parents 2319c52 + e60d170 commit bcba0f4
Show file tree
Hide file tree
Showing 12 changed files with 709 additions and 17 deletions.
60 changes: 60 additions & 0 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
name: Test
on:
push:
branches: [develop, main]
pull_request:
branches: [develop, main]

jobs:
test:
strategy:
matrix:
platform: [ubuntu-latest]
redis-version: [7]

runs-on: ${{ matrix.platform }}

services:
redis:
image: redis:${{ matrix.redis-version }}
ports:
- 6379:6379

steps:
- uses: actions/checkout@v4

- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: "20"

- name: Install pnpm
uses: pnpm/action-setup@v2
with:
version: 8
run_install: false

- name: Setup pnpm cache
uses: actions/cache@v3
with:
path: ${{ env.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-
- name: Install Rust
uses: dtolnay/rust-toolchain@stable

- name: Install Linux dependencies
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf \
libsoup-3.0-dev libjavascriptcoregtk-4.1-dev libsoup-3.0-0 webkit2gtk-4.1-dev
- name: Install frontend dependencies
run: pnpm install

- name: Run tests
run: |
cd src-tauri
cargo test
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "setui",
"private": true,
"version": "0.1.0",
"version": "0.0.1",
"type": "module",
"scripts": {
"dev": "vite",
Expand All @@ -12,6 +12,7 @@
"dependencies": {
"@hookform/resolvers": "^3.9.1",
"@radix-ui/react-dialog": "^1.1.2",
"@radix-ui/react-dropdown-menu": "^2.1.2",
"@radix-ui/react-label": "^2.1.0",
"@radix-ui/react-select": "^2.1.2",
"@radix-ui/react-separator": "^1.1.0",
Expand Down
100 changes: 100 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

58 changes: 58 additions & 0 deletions src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 5 additions & 7 deletions src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
[package]
name = "setui"
version = "0.1.0"
description = "A Tauri App"
authors = ["you"]
description = "A the best ui for redis in react + rust!"
authors = ["Erick <[email protected]>"]
edition = "2021"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[lib]
# The `_lib` suffix may seem redundant but it is necessary
# to make the lib name unique and wouldn't conflict with the bin name.
# This seems to be only an issue on Windows, see https://github.com/rust-lang/cargo/issues/8519
name = "setui_lib"
crate-type = ["staticlib", "cdylib", "rlib"]

Expand All @@ -25,3 +20,6 @@ serde_json = "1"
rusqlite = { version = "0.32.0", features = ["bundled"] }
log = "0.4.22"
redis = "0.27.5"

[dev-dependencies]
serial_test = "3.2.0"
Loading

0 comments on commit bcba0f4

Please sign in to comment.