mirror of
https://github.com/gitbutlerapp/gitbutler.git
synced 2024-08-17 00:00:31 +03:00
update configuration to reflect new paths
This commit is contained in:
parent
c5c51c9254
commit
0e33410ed4
2
.github/actions/init-env-rust/action.yaml
vendored
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
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
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]
|
||||
|
@ -3,7 +3,7 @@
|
||||
"beforeDevCommand": "pnpm dev",
|
||||
"beforeBuildCommand": "pnpm build:development",
|
||||
"devPath": "http://localhost:1420",
|
||||
"distDir": "../ui/build",
|
||||
"distDir": "../gitbutler-ui/build",
|
||||
"withGlobalTauri": false
|
||||
},
|
||||
"package": {
|
||||
|
@ -12,7 +12,7 @@ importers:
|
||||
specifier: ^1.5.6
|
||||
version: 1.5.6
|
||||
|
||||
packages/ui:
|
||||
gitbutler-ui:
|
||||
devDependencies:
|
||||
'@codemirror/lang-cpp':
|
||||
specifier: ^6.0.2
|
||||
|
@ -1,2 +1,2 @@
|
||||
packages:
|
||||
- 'packages/ui'
|
||||
- 'gitbutler-ui'
|
||||
|
@ -220,7 +220,7 @@ info " dist: $DIST"
|
||||
TMP_DIR="$(mktemp -d)"
|
||||
trap "rm -rf '$TMP_DIR'" exit
|
||||
|
||||
CONFIG_PATH=$(readlink -f "$PWD/../packages/tauri/tauri.conf.$CHANNEL.json")
|
||||
CONFIG_PATH=$(readlink -f "$PWD/../gitbutler-app/tauri.conf.$CHANNEL.json")
|
||||
|
||||
# update the version in the tauri release config
|
||||
jq '.package.version="'"$VERSION"'"' "$CONFIG_PATH" >"$TMP_DIR/tauri.conf.json"
|
||||
|
Loading…
Reference in New Issue
Block a user