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 2019/01/07 21:09:03 UTC
[camel-website] 01/02: Revert "CAMEL-11500: utilize caches and
separate Theme ..."
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch revert-5-pnp
in repository https://gitbox.apache.org/repos/asf/camel-website.git
commit 7cbf291668b0162e4e52952b0471738c780e8464
Author: Zoran Regvart <zo...@regvart.com>
AuthorDate: Mon Jan 7 22:08:58 2019 +0100
Revert "CAMEL-11500: utilize caches and separate Theme ..."
This reverts commit 1cceb5e019550dd07c0414e7da4aee117859cec8.
---
Jenkinsfile | 34 ++++++++--------------------------
package.json | 3 ++-
2 files changed, 10 insertions(+), 27 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 72de3be..3a8d177 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -28,19 +28,10 @@ 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"
- HUGO_VERSION = "0.52.0"
}
stages {
- stage('Theme') {
+ stage('Build') {
agent {
docker {
label "$NODE"
@@ -49,24 +40,15 @@ pipeline {
}
}
- steps {
- sh "cd $WORKSPACE/camel-website/antora-ui-camel && yarn --non-interactive --frozen-lockfile install"
- sh "cd $WORKSPACE/camel-website/antora-ui-camel && yarn --non-interactive gulp bundle"
- }
- }
-
- stage('Website') {
- agent {
- docker {
- label "$NODE"
- image "$NODE_IMAGE"
- reuseNode true
- }
+ environment {
+ ANTORA_CACHE_DIR = "$WORKSPACE/.antora-cache"
+ YARN_CACHE_FOLDER = "$WORKSPACE/.yarn-cache"
+ HUGO_VERSION = "0.52.0"
}
steps {
- sh "cd $WORKSPACE/camel-website && yarn --non-interactive --frozen-lockfile install"
- sh "cd $WORKSPACE/camel-website && yarn --non-interactive build"
+ sh "yarn --non-interactive --frozen-lockfile install"
+ sh "yarn --non-interactive build"
}
}
@@ -80,7 +62,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/camel-website/public/* ."
+ sh "cp -R $WORKSPACE/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 b046019..7dd039e 100644
--- a/package.json
+++ b/package.json
@@ -2,11 +2,12 @@
"version": "1.0.0-SNAPSHOT",
"license": "Apache-2.0",
"scripts": {
+ "theme": "(cd antora-ui-camel && yarn install && yarn gulp bundle)",
"documentation": "antora --clean --fetch site.yml",
"website": "hugo --minify",
"critical": "gulp critical",
"minify": "gulp minify",
- "build": "run-s documentation website minify critical"
+ "build": "run-s theme documentation website minify critical"
},
"devDependencies": {
"@antora/cli": "^2.0.0",