*! Fixing buid pipeline to include JS

2022-02-02 19:44:32 -08:00 · 2022-02-02 19:44:32 -08:00 · cbe0f7a29d
commit cbe0f7a29d
parent f8052a6ecf
2 changed files with 18 additions and 7 deletions
--- 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:
--- a/api/templates/list.html.tera
+++ b/api/templates/list.html.tera
@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <html lang="en"><head>
-	<meta name="generator" content="Hugo 0.88.1" />
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">