From 6b2a098e01187ea7872c2bd6a5a2417cca57ba54 Mon Sep 17 00:00:00 2001
From: Anton Sarukhanov <code@ant.sr>
Date: Tue, 25 Aug 2020 14:47:14 -0400
Subject: [PATCH] Include frontend deps when building in CI
---
.gitlab-ci.yml | 23 ++++++++++++++++++-----
Makefile | 5 ++++-
2 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 49871c2..16bbf56 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,13 +1,26 @@
stages:
- - build_content
+ - build_js
+ - build_html
- build_image
-build_content:
- stage: build_content
+build_js:
+ stage: build_js
+ image: node:14
+ script:
+ - npm install --dev
+ - make js
+ artifacts:
+ paths:
+ - theme/static/
+
+build_html:
+ stage: build_html
+ dependencies:
+ - build_js
image: python:3
script:
- pip install -r requirements.txt
- - pelican content -o output -s pelicanconf.py
+ - make html
artifacts:
paths:
- output/
@@ -15,7 +28,7 @@ build_content:
build_image:
stage: build_image
dependencies:
- - build_content
+ - build_html
image:
name: gcr.io/kaniko-project/executor:debug
entrypoint: [""]
diff --git a/Makefile b/Makefile
index 69c5baf..4447eb6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,8 @@
+js:
+ npm run build
+
html:
- npm run build && pelican content -o output -s pelicanconf.py
+ pelican content -o output -s pelicanconf.py
regenerate:
npm run build && pelican -r content -o output -s pelicanconf.py
--
GitLab