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/02 15:54:50 UTC
[camel-website] branch pnp updated (9b1e596 -> 0826e75)
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a change to branch pnp
in repository https://gitbox.apache.org/repos/asf/camel-website.git.
omit 9b1e596 CAMEL-11500: utilize caches and separate Theme ...
omit bdba260 CAMEL-11500: use PnP
add e9e2d85 [CAMEL-12998] Add responsive CSS
add f02af32 CAMEL-12998: Move reponsive theme to dedicated css file
new 93e69e1 CAMEL-11500: use PnP
new d5ed016 CAMEL-11500: utilize caches and separate Theme ...
new 0826e75 CAMEL-11500: add explicit dependencies for PnP
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 (9b1e596)
\
N -- N -- N refs/heads/pnp (0826e75)
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 3 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:
antora-ui-camel/package.json | 2 +
antora-ui-camel/src/css/base.css | 9 +
antora-ui-camel/src/css/main.css | 217 --
antora-ui-camel/src/css/responsive.css | 5079 ++++++++++++++++++++++++++++++++
antora-ui-camel/src/css/site.css | 1 +
antora-ui-camel/yarn.lock | 2 +-
layouts/index.html | 150 +-
layouts/partials/footer.html | 18 +-
8 files changed, 5182 insertions(+), 296 deletions(-)
create mode 100644 antora-ui-camel/src/css/responsive.css
[camel-website] 03/03: CAMEL-11500: add explicit dependencies for
PnP
Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch pnp
in repository https://gitbox.apache.org/repos/asf/camel-website.git
commit 0826e754cce08155094b3d1a8db5ac0af822d128
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Wed Jan 2 16:54:15 2019 +0100
CAMEL-11500: add explicit dependencies for PnP
---
antora-ui-camel/package.json | 2 ++
antora-ui-camel/yarn.lock | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/antora-ui-camel/package.json b/antora-ui-camel/package.json
index 045b6c3..91f2e5d 100644
--- a/antora-ui-camel/package.json
+++ b/antora-ui-camel/package.json
@@ -35,6 +35,7 @@
"highlight.js": "~9.13",
"js-yaml": "~3.12",
"merge-stream": "~1.0",
+ "plugin-error": "^1.0.1",
"postcss-calc": "~7.0",
"postcss-custom-properties": "~8.0",
"postcss-import": "~12.0",
@@ -48,6 +49,7 @@
"typeface-droid-sans-mono": "^0.0.44",
"typeface-droid-serif": "^0.0.44",
"typeface-open-sans": "^0.0.54",
+ "undertaker": "^1.2.0",
"vinyl-buffer": "~1.0",
"vinyl-fs": "~3.0"
},
diff --git a/antora-ui-camel/yarn.lock b/antora-ui-camel/yarn.lock
index 3282478..ed49246 100644
--- a/antora-ui-camel/yarn.lock
+++ b/antora-ui-camel/yarn.lock
@@ -7538,7 +7538,7 @@ undertaker-registry@^1.0.0:
resolved "https://registry.yarnpkg.com/undertaker-registry/-/undertaker-registry-1.0.1.tgz#5e4bda308e4a8a2ae584f9b9a4359a499825cc50"
integrity sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=
-undertaker@^1.0.0:
+undertaker@^1.0.0, undertaker@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/undertaker/-/undertaker-1.2.0.tgz#339da4646252d082dc378e708067299750e11b49"
integrity sha1-M52kZGJS0ILcN45wgGcpl1DhG0k=
[camel-website] 02/03: 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 pnp
in repository https://gitbox.apache.org/repos/asf/camel-website.git
commit d5ed0164d5b1c66386dc63aebf6a26677fb00f7c
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Wed Dec 19 15:21:15 2018 +0100
CAMEL-11500: utilize caches and separate Theme ...
...and Website stages
Make sure that caches are preserved between builds by checking out into
a `camel-website` subdirectory and utilizing $WORKSPACE as $HOME for any
cache folders. Also separates Theme and Website stages to make for a
cleaner build by not invoking yarn from yarn.
---
Jenkinsfile | 34 ++++++++++++++++++++++++++--------
package.json | 3 +--
2 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 3a8d177..72de3be 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -28,10 +28,19 @@ 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('Build') {
+ stage('Theme') {
agent {
docker {
label "$NODE"
@@ -40,15 +49,24 @@ pipeline {
}
}
- environment {
- ANTORA_CACHE_DIR = "$WORKSPACE/.antora-cache"
- YARN_CACHE_FOLDER = "$WORKSPACE/.yarn-cache"
- HUGO_VERSION = "0.52.0"
+ 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
+ }
}
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"
}
}
@@ -62,7 +80,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 7dd039e..b046019 100644
--- a/package.json
+++ b/package.json
@@ -2,12 +2,11 @@
"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 theme documentation website minify critical"
+ "build": "run-s documentation website minify critical"
},
"devDependencies": {
"@antora/cli": "^2.0.0",
[camel-website] 01/03: 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 pnp
in repository https://gitbox.apache.org/repos/asf/camel-website.git
commit 93e69e138718317f52f364ac628c544d545d346c
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Mon Dec 31 10:21:59 2018 +0100
CAMEL-11500: use PnP
---
.gitignore | 4 +++-
antora-ui-camel/package.json | 3 +++
package.json | 3 +++
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index f174892..bbcdae5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,6 @@ static
*.iml
.project
.classpath
-.metadata
\ No newline at end of file
+.metadata
+.pnp
+.pnp.js
diff --git a/antora-ui-camel/package.json b/antora-ui-camel/package.json
index e84238b..045b6c3 100644
--- a/antora-ui-camel/package.json
+++ b/antora-ui-camel/package.json
@@ -50,5 +50,8 @@
"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 fd249dc..7dd039e 100644
--- a/package.json
+++ b/package.json
@@ -17,5 +17,8 @@
"gulp-htmlmin": "^5.0.1",
"hugo-cli": "^0.9.0",
"npm-run-all": "^4.1.5"
+ },
+ "installConfig": {
+ "pnp": true
}
}