Skip to content

Commit

Permalink
Merge branch 'tauri' into tauri_searchable-timeline
Browse files Browse the repository at this point in the history
  • Loading branch information
yep-tf2 committed Apr 16, 2023
2 parents 79108cc + 2acb4d7 commit e8f3d2d
Show file tree
Hide file tree
Showing 52 changed files with 1,901 additions and 5,784 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ src-tauri

# Compilation output
dist
target
5 changes: 4 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,10 @@
],
"react/react-in-jsx-scope": "off",
"react/display-name": "off",
"@typescript-eslint/no-unused-vars": ["warn", { "argsIgnorePattern": "^_" }]
"@typescript-eslint/no-unused-vars": [
"warn",
{ "argsIgnorePattern": "^_", "varsIgnorePattern": "^_" }
]
},
"ignorePatterns": ["vite.config.ts"],
"settings": {
Expand Down
42 changes: 42 additions & 0 deletions .github/workflows/check-pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: Check PR

on:
pull_request:
branches-ignore: ["v1"]
workflow_dispatch:

jobs:
check:
name: Check PR
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up Node
uses: actions/setup-node@v3
with:
node-version: 16
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
components: rustfmt, clippy
- name: Install build dependencies
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
- name: Install frontend dependencies
run: npm install
- uses: tauri-apps/tauri-action@e537a6f7bc75cbe74c6668f28a9836bd8d0eac36 #@dev
with:
# Only build in debug mode so the following
# steps don't have to compile again.
includeDebug: true
includeRelease: false
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Run backend tests
run: cargo test --all-features --release
- name: Lint backend
run: |
cargo fmt --check
cargo clippy --all-features --tests
- name: Lint frontend
run: npm run lint:js
71 changes: 0 additions & 71 deletions .github/workflows/codeql-analysis.yml

This file was deleted.

1 change: 0 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,5 @@

// Prettier for js and rust
"esbenp.prettier-vscode",
"jinxdash.prettier-rust",
]
}
Loading

0 comments on commit e8f3d2d

Please sign in to comment.