ui -> webui
parent
835dec73d4
commit
0dab348f58
|
@ -14,7 +14,7 @@ cache:
|
|||
paths:
|
||||
- target
|
||||
- cargo
|
||||
- ui/node_modules
|
||||
- webui/node_modules
|
||||
|
||||
lint:backend:
|
||||
stage: lint
|
||||
|
@ -63,12 +63,12 @@ build:frontend:
|
|||
- make frontend
|
||||
artifacts:
|
||||
paths:
|
||||
- ui/public
|
||||
- webui/public
|
||||
- tools/upend_js
|
||||
expire_in: 1 day
|
||||
only:
|
||||
changes:
|
||||
- ui/**/*
|
||||
- webui/**/*
|
||||
- Makefile
|
||||
|
||||
test:backend:
|
||||
|
|
14
Makefile
14
Makefile
|
@ -1,10 +1,10 @@
|
|||
all: package
|
||||
|
||||
package: target/release/upend ui/public/build/main.js
|
||||
package: target/release/upend webui/public/build/main.js
|
||||
rm -fr dist
|
||||
linuxdeploy-x86_64.AppImage --appdir dist
|
||||
cp target/release/upend dist/usr/bin/upend
|
||||
cp -r ui/public dist/usr/bin/webui
|
||||
cp -r webui/public dist/usr/bin/webui
|
||||
cp media/upend.png dist/usr/share/icons/upend.png
|
||||
VERSION="$$(grep '^version' Cargo.toml|grep -Eo '[0-9]+\.[0-9]+\.[0-9]+')" \
|
||||
linuxdeploy-x86_64.AppImage --appdir dist -d upend.desktop --output appimage
|
||||
|
@ -17,10 +17,10 @@ target/release/upend:
|
|||
tools/upend_js/index.js:
|
||||
cd tools/upend_js && yarn install && yarn build
|
||||
|
||||
frontend: ui/public/build/main.js
|
||||
frontend: webui/public/build/main.js
|
||||
|
||||
ui/public/build/main.js: tools/upend_js/index.js
|
||||
cd ui && yarn add ../tools/upend_js && yarn install && yarn build
|
||||
webui/public/build/main.js: tools/upend_js/index.js
|
||||
cd webui && yarn add ../tools/upend_js && yarn install && yarn build
|
||||
|
||||
lint: backend_lint frontend_lint
|
||||
|
||||
|
@ -28,7 +28,7 @@ backend_lint:
|
|||
cargo clippy
|
||||
|
||||
frontend_lint:
|
||||
cd ui && yarn instlal && yarn lint
|
||||
cd webui && yarn instlal && yarn lint
|
||||
|
||||
backend_test:
|
||||
cargo test --workspace --verbose
|
||||
|
@ -38,7 +38,7 @@ backend_test_no_default:
|
|||
|
||||
clean:
|
||||
rm -vr target
|
||||
rm -vr ui/public/build
|
||||
rm -vr webui/public/build
|
||||
rm -vr tools/upend_js/*.js
|
||||
|
||||
update_schema:
|
||||
|
|
Before Width: | Height: | Size: 490 B After Width: | Height: | Size: 490 B |
Loading…
Reference in New Issue