Switched to Make commands for frontend ci
continuous-integration/drone the build failed
Details
continuous-integration/drone the build failed
Details
parent
84d135d5e3
commit
ddd498e92b
|
@ -5,3 +5,6 @@ end_of_line = lf
|
||||||
insert_final_newline = false
|
insert_final_newline = false
|
||||||
indent_style = space
|
indent_style = space
|
||||||
indent_size = 4
|
indent_size = 4
|
||||||
|
|
||||||
|
[Makefile]
|
||||||
|
indent_style = tab
|
||||||
|
|
|
@ -16,8 +16,7 @@ pipeline:
|
||||||
pull: true
|
pull: true
|
||||||
group: test
|
group: test
|
||||||
commands:
|
commands:
|
||||||
- cd web
|
- make fbuild
|
||||||
- yarn build
|
|
||||||
when:
|
when:
|
||||||
event: push
|
event: push
|
||||||
|
|
||||||
|
@ -35,8 +34,7 @@ pipeline:
|
||||||
image: node:16-alpine
|
image: node:16-alpine
|
||||||
group: lint
|
group: lint
|
||||||
commands:
|
commands:
|
||||||
- cd web
|
- make flint
|
||||||
- yarn run lint
|
|
||||||
when:
|
when:
|
||||||
event: push
|
event: push
|
||||||
|
|
||||||
|
|
44
Makefile
44
Makefile
|
@ -1,16 +1,18 @@
|
||||||
# =====CONFIG=====
|
# =====CONFIG=====
|
||||||
PYTHON := python3
|
PYTHON := python3
|
||||||
# This can't contain spaces (I think)
|
# This can't contain spaces (I think)
|
||||||
VENV := .venv
|
VENV := .venv
|
||||||
# Minimum % coverage for tests to succeed
|
# Minimum % coverage for tests to succeed
|
||||||
MIN_COV := 0
|
MIN_COV := 0
|
||||||
|
# Directory name for the frontend
|
||||||
|
WEB_DIR := web
|
||||||
|
|
||||||
|
|
||||||
# By default, just create the venv when needed
|
# By default, just create the venv when needed
|
||||||
all: venv
|
all: venv
|
||||||
|
|
||||||
|
|
||||||
# =====RECIPES=====
|
# =====BACKEND=====
|
||||||
## VENV
|
## VENV
|
||||||
### Create the venv
|
### Create the venv
|
||||||
$(VENV)/bin/activate: setup.py setup.cfg
|
$(VENV)/bin/activate: setup.py setup.cfg
|
||||||
|
@ -43,9 +45,9 @@ test: venv
|
||||||
|
|
||||||
|
|
||||||
## Cleaning
|
## Cleaning
|
||||||
# Remove the venv
|
### Remove the venv
|
||||||
clean:
|
clean:
|
||||||
@ rm -rf '$(VENV)'
|
@ rm -rf '$(VENV)' '$(WEB_DIR)'/node_modules
|
||||||
.PHONY: clean
|
.PHONY: clean
|
||||||
|
|
||||||
|
|
||||||
|
@ -53,3 +55,35 @@ clean:
|
||||||
### Run the Quart server
|
### Run the Quart server
|
||||||
run: venv
|
run: venv
|
||||||
@ '$(VENV)'/bin/python app
|
@ '$(VENV)'/bin/python app
|
||||||
|
.PHONY: run
|
||||||
|
|
||||||
|
|
||||||
|
# =====BACKEND=====
|
||||||
|
## node_modules
|
||||||
|
### Install dependencies
|
||||||
|
$(WEB_DIR)/yarn.lock: $(WEB_DIR)/package.json
|
||||||
|
@ cd web && yarn install
|
||||||
|
|
||||||
|
# Convenient alias
|
||||||
|
lockfile: $(WEB_DIR)/yarn.lock
|
||||||
|
.PHONY: lockfile
|
||||||
|
|
||||||
|
|
||||||
|
## Formatting & linting
|
||||||
|
flint: lockfile
|
||||||
|
@ cd web && yarn run lint
|
||||||
|
.PHONY: flint
|
||||||
|
|
||||||
|
fformat: lockfile
|
||||||
|
@ cd web && yarn run format
|
||||||
|
.PHONY: fformat
|
||||||
|
|
||||||
|
|
||||||
|
## Testing
|
||||||
|
# TODO add testing command
|
||||||
|
|
||||||
|
|
||||||
|
## Building
|
||||||
|
fbuild: lockfile
|
||||||
|
@ cd web && yarn build
|
||||||
|
.PHONY: fbuild
|
||||||
|
|
|
@ -422,6 +422,11 @@
|
||||||
"@vue/compiler-dom" "3.0.11"
|
"@vue/compiler-dom" "3.0.11"
|
||||||
"@vue/shared" "3.0.11"
|
"@vue/shared" "3.0.11"
|
||||||
|
|
||||||
|
"@vue/devtools-api@^6.0.0-beta.10":
|
||||||
|
version "6.0.0-beta.10"
|
||||||
|
resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.0.0-beta.10.tgz#f39da7618cee292e39c7274227c34163e30eb3ca"
|
||||||
|
integrity sha512-nktQYRnIFrh4DdXiCBjHnsHOMZXDIVcP9qlm/DMfxmjJMtpMGrSZCOKP8j7kDhObNHyqlicwoGLd+a4hf4x9ww==
|
||||||
|
|
||||||
"@vue/reactivity@3.0.11", "@vue/reactivity@^3.0.11":
|
"@vue/reactivity@3.0.11", "@vue/reactivity@^3.0.11":
|
||||||
version "3.0.11"
|
version "3.0.11"
|
||||||
resolved "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.0.11.tgz"
|
resolved "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.0.11.tgz"
|
||||||
|
@ -3637,10 +3642,12 @@ vue-eslint-parser@^7.6.0:
|
||||||
esquery "^1.4.0"
|
esquery "^1.4.0"
|
||||||
lodash "^4.17.15"
|
lodash "^4.17.15"
|
||||||
|
|
||||||
vue-router@^3.5.1:
|
vue-router@^4.0.6:
|
||||||
version "3.5.1"
|
version "4.0.8"
|
||||||
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.5.1.tgz#edf3cf4907952d1e0583e079237220c5ff6eb6c9"
|
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-4.0.8.tgz#55d4290a3122444edbc91a3cd2492bb1d0cef494"
|
||||||
integrity sha512-RRQNLT8Mzr8z7eL4p7BtKvRaTSGdCbTy2+Mm5HTJvLGYSSeG9gDzNasJPP/yOYKLy+/cLG/ftrqq5fvkFwBJEw==
|
integrity sha512-42mWSQaH7CCBQDspQTHv63f34VEnZC20g9QNK4WJ/zW8SdIUeT6TQ2i/78fjF/pVBUPLBWrGhvB7uDnaz7O/pA==
|
||||||
|
dependencies:
|
||||||
|
"@vue/devtools-api" "^6.0.0-beta.10"
|
||||||
|
|
||||||
vue-tsc@^0.1.0:
|
vue-tsc@^0.1.0:
|
||||||
version "0.1.4"
|
version "0.1.4"
|
||||||
|
|
Reference in New Issue