From 11001ff911739f92fb52276375e3deac8ebcc5eb Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Mon, 8 Jul 2019 10:09:51 +0200
Subject: [PATCH] Review app
---
.gitlab-ci.yml | 34 ++++++++++++++++++++++++++++++++++
src/router.js | 2 +-
vue.config.js | 1 +
3 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c19ed40d..6bbdc485 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,40 @@
stages:
+ - review
- build
+review:
+ stage: review
+ image: buildkite/puppeteer
+ variables:
+ GIT_STRATEGY: clone
+ VUE_APP_ROUTER_BASE_URL: /-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts/review/
+ before_script:
+ - apt-get update && apt-get install -y jq
+ - yarn install
+ script:
+ - yarn lint
+ - yarn i18n-compile
+ - yarn build
+ - rm -rf review
+ - mv dist review
+ cache:
+ key: front_node_modules
+ paths:
+ - "node_modules"
+ artifacts:
+ expire_in: 2 weeks
+ paths:
+ - review
+ only:
+ - branches
+ except:
+ - master@funkwhale/funkwhale.audio
+ tags:
+ - docker
+ environment:
+ name: review/front/$CI_COMMIT_REF_NAME
+ url: http://$CI_PROJECT_NAMESPACE.pages.funkwhale.audio/-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts/review/index.html
+
pages:
stage: build
diff --git a/src/router.js b/src/router.js
index 20477664..7a1bee5e 100644
--- a/src/router.js
+++ b/src/router.js
@@ -7,7 +7,7 @@ Vue.use(Router);
export default new Router({
mode: "history",
- base: process.env.BASE_URL,
+ base: process.env.BASE_URL || '/',
scrollBehavior (to, from, savedPosition) {
return new Promise((resolve) => {
setTimeout(() => {
diff --git a/vue.config.js b/vue.config.js
index b02f47d5..d1282ae8 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -3,6 +3,7 @@ const path = require("path");
const PrerenderSPAPlugin = require("prerender-spa-plugin");
module.exports = {
+ baseUrl: process.env.VUE_APP_ROUTER_BASE_URL || '/',
chainWebpack: (config) => {
config.plugins.delete('prefetch');
},
--
GitLab