Merge pull request #2051 from gitbutlerapp/workspace-layout
move to canonical rust workspace codebase layout
2
.github/actions/init-env-rust/action.yaml
vendored
@ -38,4 +38,4 @@ runs:
|
||||
|
||||
- name: placeholder for ui assets
|
||||
shell: bash
|
||||
run: mkdir packages/ui/build
|
||||
run: mkdir gitbutler-ui/build
|
||||
|
5
.github/workflows/push.yaml
vendored
@ -14,13 +14,12 @@ jobs:
|
||||
with:
|
||||
filters: |
|
||||
rust:
|
||||
- 'packages/tauri/**'
|
||||
- 'packages/butler/**'
|
||||
- 'gitbutler-app/**'
|
||||
- 'Cargo.lock'
|
||||
- 'Cargo.toml'
|
||||
- 'rust-toolchain.toml'
|
||||
node:
|
||||
- 'packages/ui/**'
|
||||
- 'gitbutler-ui/**'
|
||||
- 'package.json'
|
||||
- 'pnpm-lock.yaml'
|
||||
|
||||
|
2
Cargo.lock
generated
@ -1775,7 +1775,7 @@ dependencies = [
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "gitbutler"
|
||||
name = "gitbutler-app"
|
||||
version = "0.0.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
|
@ -1,6 +1,6 @@
|
||||
[workspace]
|
||||
members = [
|
||||
"packages/tauri",
|
||||
"gitbutler-app",
|
||||
]
|
||||
resolver = "2"
|
||||
|
||||
|
@ -74,7 +74,7 @@ We are also collecting tokio's runtime tracing information that could be viewed
|
||||
To build the app in production mode, run:
|
||||
|
||||
```bash
|
||||
$ pnpm tauri build --features devtools --config packages/tauri/tauri.conf.nightly.json
|
||||
$ pnpm tauri build --features devtools --config gitbutler-app/tauri.conf.nightly.json
|
||||
```
|
||||
|
||||
This will make an asset similar to our nightly build.
|
||||
|
@ -1,5 +1,5 @@
|
||||
[package]
|
||||
name = "gitbutler"
|
||||
name = "gitbutler-app"
|
||||
version = "0.0.0"
|
||||
edition = "2021"
|
||||
rust-version = "1.57"
|
||||
@ -9,7 +9,7 @@ name = "gblib"
|
||||
path = "src/lib.rs"
|
||||
|
||||
[[bin]]
|
||||
name = "gitbutler"
|
||||
name = "gitbutler-app"
|
||||
path = "src/bin.rs"
|
||||
|
||||
[build-dependencies]
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 39 KiB After Width: | Height: | Size: 39 KiB |
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 8.2 KiB After Width: | Height: | Size: 8.2 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
Before Width: | Height: | Size: 48 KiB After Width: | Height: | Size: 48 KiB |
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 57 KiB After Width: | Height: | Size: 57 KiB |
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.4 KiB |
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 4.5 KiB |
Before Width: | Height: | Size: 6.4 KiB After Width: | Height: | Size: 6.4 KiB |
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 7.5 KiB After Width: | Height: | Size: 7.5 KiB |
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 26 KiB |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 35 KiB After Width: | Height: | Size: 35 KiB |
Before Width: | Height: | Size: 51 KiB After Width: | Height: | Size: 51 KiB |
Before Width: | Height: | Size: 151 KiB After Width: | Height: | Size: 151 KiB |
Before Width: | Height: | Size: 49 KiB After Width: | Height: | Size: 49 KiB |