Skip to content

Commit f09da1b

Browse files
fix: some reloading && folder rename
1 parent 2ba70a7 commit f09da1b

46 files changed

Lines changed: 85 additions & 61 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
- name: Rust Cache
4545
uses: Swatinem/rust-cache@v2
4646
with:
47-
workspaces: "src-tauri -> target"
47+
workspaces: "src-server -> target"
4848

4949
- name: Install dependencies
5050
run: pnpm install
@@ -53,7 +53,7 @@ jobs:
5353
run: pnpm vite:build
5454

5555
- name: Build Rust release
56-
run: cargo build --manifest-path src-tauri/Cargo.toml --release
56+
run: cargo build --manifest-path src-server/Cargo.toml --release
5757

5858
- name: Create and push tag
5959
id: create_tag
@@ -87,7 +87,7 @@ jobs:
8787
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8888
with:
8989
upload_url: ${{ steps.create_release.outputs.upload_url }}
90-
asset_path: ./src-tauri/target/release/majdata-hub.exe
90+
asset_path: ./src-server/target/release/majdata-hub.exe
9191
asset_name: majdata-hub-v${{ steps.version.outputs.version }}.exe
9292
asset_content_type: application/octet-stream
9393

@@ -96,7 +96,7 @@ jobs:
9696
shell: pwsh
9797
run: |
9898
New-Item -ItemType Directory -Force -Path "temp"
99-
Copy-Item -Path "src-tauri/target/release/majdata-hub.exe" -Destination "temp/majdata-hub-v${{ steps.version.outputs.version }}.exe" -Force
99+
Copy-Item -Path "src-server/target/release/majdata-hub.exe" -Destination "temp/majdata-hub-v${{ steps.version.outputs.version }}.exe" -Force
100100
Write-Host "Prepared exe for mirror"
101101
102102
- name: Upload to CNB mirror

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,4 @@ dist-ssr
2424
*.sw?
2525

2626
dev/
27-
.tauri/
2827
.claude/

.vscode/extensions.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
{
2-
"recommendations": ["tauri-apps.tauri-vscode", "rust-lang.rust-analyzer"]
3-
}
2+
"recommendations": [
3+
"rust-lang.rust-analyzer"
4+
]
5+
}

README.md

Lines changed: 8 additions & 9 deletions

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"name": "majdata-hub",
33
"private": true,
4-
"version": "0.5.1",
4+
"version": "0.5.2",
55
"type": "module",
66
"scripts": {
7-
"dev": "concurrently \"pnpm vite:dev\" \"cargo run --manifest-path src-tauri/Cargo.toml\"",
7+
"dev": "concurrently \"pnpm vite:dev\" \"cargo run --manifest-path src-server/Cargo.toml\"",
88
"bump:minor": "node scripts/bump-minor.mjs",
99
"bump:fix": "node scripts/bump-fix.mjs",
10-
"build": "pnpm vite:build && cargo build --release --manifest-path src-tauri/Cargo.toml",
10+
"build": "pnpm vite:build && cargo build --release --manifest-path src-server/Cargo.toml",
1111
"vite:dev": "vite",
1212
"vite:build": "tsc && vite build"
1313
},

scripts/bump-fix.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const root = resolve(__dirname, '..');
77

88
const packageJsonPath = resolve(root, 'package.json');
99
const readmePath = resolve(root, 'README.md');
10-
const cargoTomlPath = resolve(root, 'src-tauri', 'Cargo.toml');
10+
const cargoTomlPath = resolve(root, 'src-server', 'Cargo.toml');
1111

1212
function bumpFix(version) {
1313
const parts = version.split('.').map(Number);

scripts/bump-minor.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const root = resolve(__dirname, '..');
77

88
const packageJsonPath = resolve(root, 'package.json');
99
const readmePath = resolve(root, 'README.md');
10-
const cargoTomlPath = resolve(root, 'src-tauri', 'Cargo.toml');
10+
const cargoTomlPath = resolve(root, 'src-server', 'Cargo.toml');
1111

1212
function bumpMinor(version) {
1313
const parts = version.split('.').map(Number);
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "majdata-hub"
3-
version = "0.5.1"
3+
version = "0.5.2"
44
description = "Majdata Hub - localhost server"
55
authors = ["KirisameVanilla"]
66
edition = "2021"

0 commit comments

Comments
 (0)