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:26 UTC
[camel-website] branch jenkinsfile updated (3af2e49 -> 84c765a)
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 3af2e49 Test preview
add 6a52e1f CAMEL-11492: Cleanup
add f59e446 CAMEL-11492: Cleanup build and optimize with cr...
add 69046de CAMEL-11492: add HTML minification
add 0e0d8bd CAMEL-11492: update to the latest Antora Default UI
add 317b1a8 CAMEL-11492: fetch docs from camel master
add 35248c6 CAMEL-11492: always pull to refresh git sources
new 84c765a 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 (3af2e49)
\
N -- N -- N refs/heads/jenkinsfile (84c765a)
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:
Dockerfile | 8 -
Jenkinsfile | 121 +-
.../docs/modules/ROOT/pages/templates.adoc | 9 +
.../src/partials/navigation-explore.hbs | 4 +-
antora-ui-camel/src/partials/page-versions.hbs | 4 +-
config.toml | 4 +-
gulpfile.js | 20 +
layouts/partials/footer.html | 3 -
package.json | 12 +-
site.yml | 7 +-
yarn.lock | 3849 +++++++++++++++++++-
11 files changed, 3901 insertions(+), 140 deletions(-)
delete mode 100644 Dockerfile
create mode 100644 gulpfile.js
[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 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",