*! Fixing buid pipeline to include JS

This commit is contained in:
shockrah 2022-02-02 19:44:32 -08:00
parent f8052a6ecf
commit cbe0f7a29d
2 changed files with 18 additions and 7 deletions

View File

@ -1,6 +1,7 @@
stages: stages:
- pages - pages
- build - build-frontend
- build-backend
- deploy - deploy
pages: pages:
@ -18,15 +19,26 @@ pages:
paths: paths:
- public/ - 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 # Literally both of these fail 99% of the time so I'm forgoing them completely
# for now until I find something doesn't suck # for now until I find something doesn't suck
# Builds out the intended zip package # Builds out the intended zip package
build-binaries: build-server-binaries:
image: rustlang/rust:nightly image: rustlang/rust:nightly
stage: build stage: build-backend
script: script:
- mkdir -p build - mkdir -p build
- cp api/templates/ api/static/ build -r - cp api/templates/ api/static/ build/ -r
- cd api/ - cd api/
- cargo build --release - cargo build --release
- cd ../ - cd ../
@ -46,9 +58,9 @@ deploy-docker-image:
refs: refs:
- master - master
needs: needs:
- build-binaries - build-server-binaries
dependencies: dependencies:
- build-binaries - build-server-binaries
services: services:
- docker:dind - docker:dind
script: script:

View File

@ -1,6 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"><head> <html lang="en"><head>
<meta name="generator" content="Hugo 0.88.1" />
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1"> <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"> <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">