diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3c5066e..b6593b9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,7 @@ stages: - pages - - build + - build-frontend + - build-backend - deploy pages: @@ -18,15 +19,26 @@ pages: paths: - public/ +build-frontend-js: + image: asdf + stage: build-frontend + script: + - cd ts/ + - npm run setup + - npm run build + artifacts: + paths: + - api/static/ + # Literally both of these fail 99% of the time so I'm forgoing them completely # for now until I find something doesn't suck # Builds out the intended zip package -build-binaries: +build-server-binaries: image: rustlang/rust:nightly - stage: build + stage: build-backend script: - mkdir -p build - - cp api/templates/ api/static/ build -r + - cp api/templates/ api/static/ build/ -r - cd api/ - cargo build --release - cd ../ @@ -46,9 +58,9 @@ deploy-docker-image: refs: - master needs: - - build-binaries + - build-server-binaries dependencies: - - build-binaries + - build-server-binaries services: - docker:dind script: diff --git a/api/templates/list.html.tera b/api/templates/list.html.tera index a69457b..a802f1d 100644 --- a/api/templates/list.html.tera +++ b/api/templates/list.html.tera @@ -1,6 +1,5 @@
-