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:26 UTC
[camel-website] 01/02: 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 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
}
}