chore, ci: fix Makefile, .gitlab-ci.yml
- missed `webui/public` paths replaced with `webui/dist` - made makefile check for `webui/dist` so that re-building isn't needed in package step - added --immutable to yarn installsfeat/type-attributes v0.0.64-1
parent
d88963b447
commit
2c707c9abb
|
@ -87,7 +87,7 @@ build:frontend:
|
||||||
- make frontend
|
- make frontend
|
||||||
artifacts:
|
artifacts:
|
||||||
paths:
|
paths:
|
||||||
- webui/public
|
- webui/dist
|
||||||
- tools/upend_js
|
- tools/upend_js
|
||||||
expire_in: 1 day
|
expire_in: 1 day
|
||||||
only:
|
only:
|
||||||
|
|
18
Makefile
18
Makefile
|
@ -15,10 +15,12 @@ target/release/upend:
|
||||||
cargo build --release
|
cargo build --release
|
||||||
|
|
||||||
tools/upend_js/index.js:
|
tools/upend_js/index.js:
|
||||||
cd tools/upend_js && yarn install && yarn build
|
cd tools/upend_js && yarn install --immutable && yarn build
|
||||||
|
|
||||||
frontend: tools/upend_js/index.js
|
frontend: webui/dist
|
||||||
cd webui && yarn add ../tools/upend_js && yarn install && yarn build
|
|
||||||
|
webui/dist: tools/upend_js/index.js
|
||||||
|
cd webui && yarn add ../tools/upend_js && yarn install --immutable && yarn build
|
||||||
|
|
||||||
lint: backend_lint frontend_lint
|
lint: backend_lint frontend_lint
|
||||||
|
|
||||||
|
@ -29,10 +31,10 @@ backend_lint_no_default:
|
||||||
cargo clippy --no-default-features
|
cargo clippy --no-default-features
|
||||||
|
|
||||||
frontend_lint:
|
frontend_lint:
|
||||||
cd webui && yarn add ../tools/upend_js && yarn install && yarn check && yarn lint
|
cd webui && yarn add ../tools/upend_js && yarn install --immutable && yarn check && yarn lint
|
||||||
|
|
||||||
frontend_lib_lint:
|
frontend_lib_lint:
|
||||||
cd tools/upend_js && yarn install && yarn lint
|
cd tools/upend_js && yarn install --immutable && yarn lint
|
||||||
|
|
||||||
backend_test:
|
backend_test:
|
||||||
cargo test --workspace --verbose
|
cargo test --workspace --verbose
|
||||||
|
@ -41,9 +43,9 @@ backend_test_no_default:
|
||||||
cargo test --no-default-features --workspace --verbose
|
cargo test --no-default-features --workspace --verbose
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -vr target
|
rm -vrf target
|
||||||
rm -vr webui/dist webui/public/vendor
|
rm -vrf webui/dist webui/public/vendor
|
||||||
rm -vr tools/upend_js/*.js
|
rm -vrf tools/upend_js/*.js
|
||||||
|
|
||||||
update_schema:
|
update_schema:
|
||||||
rm -f upend.sqlite3
|
rm -f upend.sqlite3
|
||||||
|
|
Loading…
Reference in New Issue