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:20:25 UTC
[camel-website] branch jenkinsfile updated (29701bb -> e4598e7)
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 29701bb CAMEL-11500: cleanup build
new 2e7e3c0 CAMEL-11500: cleanup build
new e4598e7 X
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 (29701bb)
\
N -- N -- N refs/heads/jenkinsfile (e4598e7)
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 2 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:
.gitignore | 5 +++--
Jenkinsfile | 14 ++++++++++----
antora-ui-camel/package.json | 3 +++
package.json | 3 +++
4 files changed, 19 insertions(+), 6 deletions(-)
[camel-website] 01/02: 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 2e7e3c0fec831b44a8c045b53ca6b87ec67bcb7f
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.
---
.gitignore | 5 +++--
Jenkinsfile | 32 +++++++++++++++++++++++++-------
antora-ui-camel/package.json | 3 +++
package.json | 6 ++++--
4 files changed, 35 insertions(+), 11 deletions(-)
diff --git a/.gitignore b/.gitignore
index f174892..8217d4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,10 @@
node_modules
public
static
-
.idea
*.iml
.project
.classpath
-.metadata
\ No newline at end of file
+.metadata
+.pnp*
+
diff --git a/Jenkinsfile b/Jenkinsfile
index e76b562..fb00240 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 install"
+ sh "cd $WORKSPACE/camel-website/antora-ui-camel && yarn --non-interactive 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 install"
+ sh "cd $WORKSPACE/camel-website && yarn --non-interactive 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/antora-ui-camel/package.json b/antora-ui-camel/package.json
index 2999ae6..9aa58d3 100644
--- a/antora-ui-camel/package.json
+++ b/antora-ui-camel/package.json
@@ -48,5 +48,8 @@
"typeface-open-sans": "^0.0.54",
"vinyl-buffer": "^1.0.0",
"vinyl-fs": "^2.4.4"
+ },
+ "installConfig": {
+ "pnp": true
}
}
diff --git a/package.json b/package.json
index a564821..92fbbed 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",
@@ -15,5 +14,8 @@
"gulp-htmlmin": "^5.0.1",
"hugo-bin": "^0.39.0",
"npm-run-all": "^4.1.5"
+ },
+ "installConfig": {
+ "pnp": true
}
}
[camel-website] 02/02: X
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 e4598e7017f0c94a6ac1e2efaf792321eb2eeef3
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Sun Dec 16 15:20:23 2018 +0100
X
---
Jenkinsfile | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/Jenkinsfile b/Jenkinsfile
index fb00240..2ecaa6f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -87,4 +87,10 @@ pipeline {
}
}
}
+
+ post {
+ cleanup {
+ cleanWs()
+ }
+ }
}