Skip to content

Commit

Permalink
(temp) Use cargo version of tauri CLI
Browse files Browse the repository at this point in the history
  • Loading branch information
Geometrically committed Sep 10, 2024
1 parent c2c55b3 commit 8bb7aff
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 123 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/app-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ jobs:
with:
components: rustfmt, clippy

- name: Install Tauri CLI
run: cargo install tauri-cli --git https://github.com/modrinth/tauri.git --rev c2b059b85370e1a7018faf3286d2cd8b8ce58a38

- name: Setup rust cache
uses: actions/cache@v4
with:
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ jobs:
sudo apt-get update
sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
- name: Install Tauri CLI
run: cargo install tauri-cli --git https://github.com/modrinth/tauri.git --rev c2b059b85370e1a7018faf3286d2cd8b8ce58a38

- name: Setup Node.JS environment
uses: actions/setup-node@v4
with:
Expand Down
1 change: 0 additions & 1 deletion apps/app-frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
"devDependencies": {
"@eslint/compat": "^1.1.1",
"@nuxt/eslint-config": "^0.5.6",
"@tauri-apps/cli": "^2.0.0-rc",
"@vitejs/plugin-vue": "^5.0.4",
"autoprefixer": "^10.4.19",
"eslint": "^9.9.1",
Expand Down
2 changes: 1 addition & 1 deletion apps/app-frontend/src/pages/Settings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { hide_ads_window } from '@/helpers/ads.js'
import ConfirmModalWrapper from '@/components/ui/modal/ConfirmModalWrapper.vue'
onMounted(() => {
hide_ads_window()
hide_ads_window(true)
})
const pageOptions = ['Home', 'Library']
Expand Down
1 change: 1 addition & 0 deletions apps/app/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ Before you begin, ensure you have the following installed on your machine:
Follow these steps to set up your development environment:

```bash
cargo install tauri-cli --git https://github.com/modrinth/tauri.git --rev c2b059b85370e1a7018faf3286d2cd8b8ce58a38
pnpm install
pnpm app:dev
```
Expand Down
9 changes: 3 additions & 6 deletions apps/app/package.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
{
"name": "@modrinth/app",
"scripts": {
"build": "tauri build",
"tauri": "tauri",
"dev": "tauri dev",
"build": "cargo tauri build",
"tauri": "cargo tauri",
"dev": "cargo tauri dev",
"test": "cargo test",
"lint": "cargo fmt --check && cargo clippy -- -D warnings",
"fix": "cargo fmt && cargo clippy --fix"
},
"devDependencies": {
"@tauri-apps/cli": "^2.0.0-rc"
},
"dependencies": {
"@modrinth/app-frontend": "workspace:*",
"@modrinth/app-lib": "workspace:*"
Expand Down
115 changes: 0 additions & 115 deletions pnpm-lock.yaml

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

0 comments on commit 8bb7aff

Please sign in to comment.