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:18 UTC
[camel-website] branch master updated (1cceb5e -> 5eae863)
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-website.git.
from 1cceb5e CAMEL-11500: utilize caches and separate Theme ...
new 4d213b4 Revert "CAMEL-11500: utilize caches and separate Theme ..."
new 5eae863 Revert "CAMEL-11500: use PnP"
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 | 4 +---
Jenkinsfile | 34 ++++++++--------------------------
antora-ui-camel/package.json | 3 ---
package.json | 6 ++----
4 files changed, 11 insertions(+), 36 deletions(-)
[camel-website] 01/02: Revert "CAMEL-11500: utilize caches and
separate Theme ..."
Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-website.git
commit 4d213b4ae9747e5dd600f29e29380b20000e14a8
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",
[camel-website] 02/02: Revert "CAMEL-11500: use PnP"
Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-website.git
commit 5eae863054d75fffae96df16cb75d7e87d0631fb
Author: Zoran Regvart <zo...@regvart.com>
AuthorDate: Mon Jan 7 22:08:58 2019 +0100
Revert "CAMEL-11500: use PnP"
This reverts commit 9f02238a615789341d188353d49d85ca7e182506.
---
.gitignore | 4 +---
antora-ui-camel/package.json | 3 ---
package.json | 3 ---
3 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/.gitignore b/.gitignore
index bbcdae5..f174892 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,4 @@ static
*.iml
.project
.classpath
-.metadata
-.pnp
-.pnp.js
+.metadata
\ No newline at end of file
diff --git a/antora-ui-camel/package.json b/antora-ui-camel/package.json
index 045b6c3..e84238b 100644
--- a/antora-ui-camel/package.json
+++ b/antora-ui-camel/package.json
@@ -50,8 +50,5 @@
"typeface-open-sans": "^0.0.54",
"vinyl-buffer": "~1.0",
"vinyl-fs": "~3.0"
- },
- "installConfig": {
- "pnp": true
}
}
diff --git a/package.json b/package.json
index 7dd039e..fd249dc 100644
--- a/package.json
+++ b/package.json
@@ -17,8 +17,5 @@
"gulp-htmlmin": "^5.0.1",
"hugo-cli": "^0.9.0",
"npm-run-all": "^4.1.5"
- },
- "installConfig": {
- "pnp": true
}
}