Skip to content

Commit

Permalink
Merge commit '396f737612ddb590d480ca3555e538c6bff045ca' into feature-1
Browse files Browse the repository at this point in the history
  • Loading branch information
DIDIRUS4 committed Aug 27, 2024
2 parents 82cc9d4 + 396f737 commit 707bdd6
Show file tree
Hide file tree
Showing 154 changed files with 6,868 additions and 4,807 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/app-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
with:
args: --target universal-apple-darwin
args: "--target universal-apple-darwin --config ./apps/app/tauri-release.conf.json"
working-directory: ./apps/app
includeDebug: true

Expand All @@ -104,6 +104,7 @@ jobs:
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
with:
args: "--config ./apps/app/tauri-release.conf.json"
working-directory: ./apps/app
includeDebug: true

Expand Down
6 changes: 2 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@ testem.log
.DS_Store
Thumbs.db

.nx/cache
.nx/workspace-data

# Nuxt dev/build outputs
.output
.data
Expand All @@ -57,7 +54,8 @@ apps/frontend/src/generated
.turbo
target
generated
.env

# app testing dir
app-playground-data/*
apps/app-frontend/vite.config.ts.timestamp-*
apps/app-frontend/vite.config.ts.timestamp-*
15 changes: 12 additions & 3 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
{
"prettier.endOfLine": "lf",
"editor.formatOnSave": true
}
"prettier.endOfLine": "lf",
"editor.formatOnSave": true,
"eslint.validate": [
"javascript",
"javascriptreact",
"typescript",
"typescriptreact"
],
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit"
}
}
Loading

0 comments on commit 707bdd6

Please sign in to comment.