You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by zr...@apache.org on 2018/12/16 13:34:27 UTC
[camel-website] 01/01: CAMEL-11500: cleanup build
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch jenkinsfile
in repository https://gitbox.apache.org/repos/asf/camel-website.git
commit 84c765a71f0e81fcac154d895951d71b8a100725
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Sun Dec 16 14:33:20 2018 +0100
CAMEL-11500: cleanup build
This removes the invocation of yarn to build theme from yarn to build
the website, it was too error prone. Also checkout is done in a
workspace sub-directory so caches can be preserved at workspace level.
---
Jenkinsfile | 31 ++++++++++++++++++++++++++-----
package.json | 1 -
2 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index e76b562..774bc55 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -28,10 +28,18 @@ pipeline {
buildDiscarder(
logRotator(artifactNumToKeepStr: '5', numToKeepStr: '10')
)
+
+ checkoutToSubdirectory('camel-website')
+ }
+
+ environment {
+ HOME = "$WORKSPACE"
+ ANTORA_CACHE_DIR = "$WORKSPACE/.antora-cache"
+ YARN_CACHE_FOLDER = "$WORKSPACE/.yarn-cache"
}
stages {
- stage('Build') {
+ stage('Theme') {
agent {
docker {
label "$NODE"
@@ -40,12 +48,25 @@ pipeline {
}
}
- environment {
- ANTORA_CACHE_DIR = "$WORKSPACE/.antora-cache"
- YARN_CACHE_FOLDER = "$WORKSPACE/.yarn-cache"
+ steps {
+ dir('camel-website/antora-ui-camel') {
+ sh "yarn --non-interactive --frozen-lockfile install"
+ sh "yarn --non-interactive pack"
+ }
+ }
+ }
+
+ stage('Website') {
+ agent {
+ docker {
+ label "$NODE"
+ image "$NODE_IMAGE"
+ reuseNode true
+ }
}
steps {
+ dir('camel-website')
sh "yarn --non-interactive --frozen-lockfile install"
sh "yarn --non-interactive build"
}
@@ -61,7 +82,7 @@ pipeline {
deleteDir()
sh 'git clone -b asf-site https://gitbox.apache.org/repos/asf/camel-website.git .'
sh 'git rm -r *'
- sh "cp -R $WORKSPACE/public/* ."
+ sh "cp -R $WORKSPACE/camel-website/public/* ."
sh 'git add .'
sh 'git commit -m "Website updated to $(git rev-parse --short HEAD)"'
sh 'git push origin asf-site'
diff --git a/package.json b/package.json
index a564821..944afb6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,5 @@
{
"scripts": {
- "theme": "(cd antora-ui-camel && yarn install && yarn gulp pack)",
"documentation": "antora --pull site.yml",
"website": "hugo --minify",
"critical": "gulp critical",