filipriec/komp_ac
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

server restore from dump

Browse Source
This commit is contained in:
Priec
2026-09-02 21:27:54 +02:00
parent 8eba1ef735
commit db55067708
5 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client-gui2

Submodule client-gui2 updated: 9ec1b9fe49...449c50994b

6
packaging/appimage/README.md
View File

@@ -29,7 +29,7 @@ packaging/appimage/build.sh ./KompAC.AppImage
This performs the existing builds independently: This performs the existing builds independently:
1. `nix build '.?submodules=1#portable-server'` 1. `nix build '.?submodules=1#portable-server'`
2. `yarn tauri build --bundles appimage` in `client-gui2` 2. `yarn tauri build --bundles appimage --features full-embed` in `client-gui2`
3. `assemble.sh` to add the portable server and supervisor to the GUI AppImage 3. `assemble.sh` to add the portable server and supervisor to the GUI AppImage
The standalone server and GUI build processes remain available unchanged. The standalone server and GUI build processes remain available unchanged.
@@ -38,7 +38,9 @@ The standalone server and GUI build processes remain available unchanged.
Already-built artifacts can be combined without rebuilding either application. Already-built artifacts can be combined without rebuilding either application.
The first argument may be either a completed GUI AppImage or Tauri's completed The first argument may be either a completed GUI AppImage or Tauri's completed
`.AppDir` directory: `.AppDir` directory. When combining with an embedded server, the GUI artifact
must have been built with its `full-embed` feature so it can safely place local
dump files into the bundled server's dump directory:
```sh ```sh
packaging/appimage/assemble.sh \ packaging/appimage/assemble.sh \

2
packaging/appimage/build.sh
View File

@@ -31,7 +31,7 @@ trap cleanup EXIT INT TERM HUP
set +e set +e
( (
cd -- "$repo_root/client-gui2" cd -- "$repo_root/client-gui2"
yarn tauri build --bundles appimage yarn tauri build --bundles appimage --features full-embed
) )
tauri_status=$? tauri_status=$?
set -e set -e

8
packaging/appimage/container-build-debian.sh
View File

@@ -162,11 +162,15 @@ case "$appimage_bundle_dir" in
exit 1 exit 1
;; ;;
esac esac
echo "+ yarn tauri build --bundles appimage" gui_features=()
if [[ "$server_db_mode" == embedded ]]; then
gui_features=(--features full-embed)
fi
echo "+ yarn tauri build --bundles appimage ${gui_features[*]}"
set +e set +e
APPIMAGE_EXTRACT_AND_RUN=1 \ APPIMAGE_EXTRACT_AND_RUN=1 \
CARGO_TARGET_DIR=/cargo-target \ CARGO_TARGET_DIR=/cargo-target \
yarn tauri build --bundles appimage yarn tauri build --bundles appimage "${gui_features[@]}"
tauri_status=$? tauri_status=$?
set -e set -e

2
packaging/flatpak/com.kompac.client.yml
View File

@@ -100,7 +100,7 @@ modules:
- cp postgresql-cache/postgresql-17.10.0-x86_64-unknown-linux-gnu.tar.gz "$HOME/.theseus/postgresql/" - cp postgresql-cache/postgresql-17.10.0-x86_64-unknown-linux-gnu.tar.gz "$HOME/.theseus/postgresql/"
- cargo build --locked --release --package server --features full-embed - cargo build --locked --release --package server --features full-embed
- cd client-gui2 && corepack yarn install --frozen-lockfile --non-interactive - cd client-gui2 && corepack yarn install --frozen-lockfile --non-interactive
- cd client-gui2 && CARGO_TARGET_DIR=/run/build/komp-ac/target/gui corepack yarn tauri build --no-bundle - cd client-gui2 && CARGO_TARGET_DIR=/run/build/komp-ac/target/gui corepack yarn tauri build --no-bundle --features full-embed
- install -Dm755 /run/build/komp-ac/target/server/release/server /app/bin/komp-ac-server - install -Dm755 /run/build/komp-ac/target/server/release/server /app/bin/komp-ac-server
- install -Dm755 /run/build/komp-ac/target/gui/release/client-gui2 /app/bin/client-gui2 - install -Dm755 /run/build/komp-ac/target/gui/release/client-gui2 /app/bin/client-gui2
- install -Dm755 packaging/flatpak/launcher.sh /app/bin/komp-ac - install -Dm755 packaging/flatpak/launcher.sh /app/bin/komp-ac