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 14:08:33 UTC
[camel-website] branch jenkinsfile updated (ed814ea -> 29701bb)
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a change to branch jenkinsfile
in repository https://gitbox.apache.org/repos/asf/camel-website.git.
discard ed814ea X
discard d7c3a64 CAMEL-11500: cleanup build
new 29701bb CAMEL-11500: cleanup build
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (ed814ea)
\
N -- N -- N refs/heads/jenkinsfile (29701bb)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Jenkinsfile | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
[camel-website] 01/01: CAMEL-11500: cleanup build
Posted by zr...@apache.org.
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 29701bb29f46f173479eac8f5b8c1b435fd7aa5f
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Sun Dec 16 15:07:06 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 | 32 +++++++++++++++++++++++++-------
package.json | 3 +--
2 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index e76b562..3d7a2ed 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,14 +48,24 @@ pipeline {
}
}
- environment {
- ANTORA_CACHE_DIR = "$WORKSPACE/.antora-cache"
- YARN_CACHE_FOLDER = "$WORKSPACE/.yarn-cache"
+ steps {
+ sh "cd $WORKSPACE/camel-website/antora-ui-camel && yarn --non-interactive --frozen-lockfile --modules-folder $WORKSPACE/node-modules.theme install"
+ sh "cd $WORKSPACE/camel-website/antora-ui-camel && yarn --non-interactive --modules-folder $WORKSPACE/node-modules.theme gulp pack"
+ }
+ }
+
+ stage('Website') {
+ agent {
+ docker {
+ label "$NODE"
+ image "$NODE_IMAGE"
+ reuseNode true
+ }
}
steps {
- sh "yarn --non-interactive --frozen-lockfile install"
- sh "yarn --non-interactive build"
+ sh "cd $WORKSPACE/camel-website && yarn --non-interactive --frozen-lockfile --modules-folder $WORKSPACE/node-modules.website install"
+ sh "cd $WORKSPACE/camel-website && yarn --non-interactive --modules-folder $WORKSPACE/node-modules.website build"
}
}
@@ -61,7 +79,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..29978eb 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,10 @@
{
"scripts": {
- "theme": "(cd antora-ui-camel && yarn install && yarn gulp pack)",
"documentation": "antora --pull site.yml",
"website": "hugo --minify",
"critical": "gulp critical",
"minify": "gulp minify",
- "build": "run-s theme documentation website minify critical"
+ "build": "run-s documentation website minify critical"
},
"devDependencies": {
"@antora/cli": "^2.0.0-beta.1",