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/04 16:07:41 UTC
[camel-website] branch pnp updated (9ff97d3 -> 9391ce8)
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.
discard 9ff97d3 CAMEL-11500: for PnP to work we need Yarn 13+
discard 2778903 CAMEL-11500: one more dependency needed for PnP
discard 183f358 CAMEL-11500: for theme only default gulp task i...
discard f8338ed CAMEL-11500: more fixes for PnP
discard 0826e75 CAMEL-11500: add explicit dependencies for PnP
discard d5ed016 CAMEL-11500: utilize caches and separate Theme ...
discard 93e69e1 CAMEL-11500: use PnP
add 8e8e669 CAMEL-12997: Create menu and single pages
new fce4d68 CAMEL-11500: use PnP
new 325f63b CAMEL-11500: utilize caches and separate Theme ...
new c52c8ca CAMEL-11500: add explicit dependencies for PnP
new f7d3011 CAMEL-11500: more fixes for PnP
new 26b263e CAMEL-11500: for theme only default gulp task i...
new 116f122 CAMEL-11500: one more dependency needed for PnP
new 9391ce8 CAMEL-11500: for PnP to work we need Yarn 13+
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 (9ff97d3)
\
N -- N -- N refs/heads/pnp (9391ce8)
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 7 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 | 12 ++++
antora-ui-camel/src/css/header.css | 6 --
antora-ui-camel/src/css/responsive.css | 9 +++
config.toml | 128 +++++++++++++++++++++++++++++++--
content/community/article.md | 1 +
content/community/camel-extra.md | 1 +
content/community/contributing.md | 1 +
content/community/support.md | 1 +
content/community/team.md | 1 +
content/community/user-stories.md | 1 +
content/docs/getting-started.md | 1 +
content/download/_index.md | 2 +
content/news/_index.md | 1 +
content/projects/camel-k.md | 1 +
layouts/community/single.html | 9 +++
layouts/docs/single.html | 9 +++
layouts/download/download.html | 9 +++
layouts/news/news.html | 9 +++
layouts/partials/footer.html | 24 +++----
layouts/partials/header.html | 2 +-
layouts/projects/single.html | 9 +++
site.yml | 18 ++---
22 files changed, 222 insertions(+), 33 deletions(-)
create mode 100644 content/community/article.md
create mode 100644 content/community/camel-extra.md
create mode 100644 content/community/contributing.md
create mode 100644 content/community/support.md
create mode 100644 content/community/team.md
create mode 100644 content/community/user-stories.md
create mode 100644 content/docs/getting-started.md
create mode 100644 content/download/_index.md
create mode 100644 content/news/_index.md
create mode 100644 content/projects/camel-k.md
create mode 100644 layouts/community/single.html
create mode 100644 layouts/docs/single.html
create mode 100644 layouts/download/download.html
create mode 100644 layouts/news/news.html
create mode 100644 layouts/projects/single.html
[camel-website] 02/07: 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 325f63b1e5bf0f34ecabed679f1a03c06374c1a5
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/07: 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 fce4d6839d7936a8e80bbae9ac7dc65e6953e98d
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
}
}
[camel-website] 03/07: 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 c52c8ca105514b35a3344143c42dcabfe7d26069
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] 06/07: CAMEL-11500: one more dependency needed 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 116f12225cd8d70068296f8ad659d3ccb25c6e6c
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Fri Jan 4 13:13:42 2019 +0100
CAMEL-11500: one more dependency needed for PnP
---
package.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/package.json b/package.json
index b046019..ab1512f 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,8 @@
"gulp": "^4.0.0",
"gulp-htmlmin": "^5.0.1",
"hugo-cli": "^0.9.0",
- "npm-run-all": "^4.1.5"
+ "npm-run-all": "^4.1.5",
+ "opal-runtime": "1.0.11"
},
"installConfig": {
"pnp": true
[camel-website] 04/07: CAMEL-11500: more fixes 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 f7d301156b7ff74702d9c33acbd1708a7e1a76e3
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Fri Jan 4 12:14:45 2019 +0100
CAMEL-11500: more fixes for PnP
---
antora-ui-camel/gulpfile.js/tasks/build.js | 3 +-
antora-ui-camel/package.json | 7 +-
antora-ui-camel/yarn.lock | 104 ++++++++++++++---------------
3 files changed, 58 insertions(+), 56 deletions(-)
diff --git a/antora-ui-camel/gulpfile.js/tasks/build.js b/antora-ui-camel/gulpfile.js/tasks/build.js
index a2997e9..0126d50 100644
--- a/antora-ui-camel/gulpfile.js/tasks/build.js
+++ b/antora-ui-camel/gulpfile.js/tasks/build.js
@@ -16,6 +16,7 @@ const postcssCalc = require('postcss-calc')
const postcssImport = require('postcss-import')
const postcssUrl = require('postcss-url')
const postcssVar = require('postcss-custom-properties')
+const resolve = require('resolve')
const uglify = require('gulp-uglify')
const vfs = require('vinyl-fs')
@@ -28,7 +29,7 @@ module.exports = (src, dest, preview) => () => {
filter: '**/~typeface-*/files/*',
url: (asset) => {
const relpath = asset.pathname.substr(1)
- const abspath = ospath.resolve('node_modules', relpath)
+ const abspath = resolve.sync(relpath)
const basename = ospath.basename(abspath)
const destpath = ospath.join(dest, 'font', basename)
if (!fs.pathExistsSync(destpath)) fs.copySync(abspath, destpath)
diff --git a/antora-ui-camel/package.json b/antora-ui-camel/package.json
index 91f2e5d..e784905 100644
--- a/antora-ui-camel/package.json
+++ b/antora-ui-camel/package.json
@@ -36,6 +36,7 @@
"js-yaml": "~3.12",
"merge-stream": "~1.0",
"plugin-error": "^1.0.1",
+ "postcss": "~7.0",
"postcss-calc": "~7.0",
"postcss-custom-properties": "~8.0",
"postcss-import": "~12.0",
@@ -43,16 +44,20 @@
"prettier-eslint": "~8.8",
"require-directory": "~2.1",
"require-from-string": "~2.0",
+ "resolve": "~1.9",
"stylelint": "~9.9",
"stylelint-config-standard": "~18.2",
"through2": "~3.0",
"typeface-droid-sans-mono": "^0.0.44",
"typeface-droid-serif": "^0.0.44",
"typeface-open-sans": "^0.0.54",
- "undertaker": "^1.2.0",
+ "undertaker": "~1.2",
"vinyl-buffer": "~1.0",
"vinyl-fs": "~3.0"
},
+ "resolutions": {
+ "resolve": "~1.9"
+ },
"installConfig": {
"pnp": true
}
diff --git a/antora-ui-camel/yarn.lock b/antora-ui-camel/yarn.lock
index ed49246..11d0c1d 100644
--- a/antora-ui-camel/yarn.lock
+++ b/antora-ui-camel/yarn.lock
@@ -206,9 +206,9 @@ acorn@^5.5.0:
integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
acorn@^6.0.2:
- version "6.0.4"
- resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.4.tgz#77377e7353b72ec5104550aa2d2097a2fd40b754"
- integrity sha512-VY4i5EKSKkofY2I+6QLTbTTN/UvEQPCo6eiwzzSaSWfpaDhOmStMCMod6wmuPciNq+XS0faCglFu2lHZpdHUtg==
+ version "6.0.5"
+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.5.tgz#81730c0815f3f3b34d8efa95cb7430965f4d887a"
+ integrity sha512-i33Zgp3XWtmZBMNvCr4azvOFeWVw1Rk6p3hfi3LUDvIFraOMywb1kAtrbi+med14m4Xfpqm3zRZMT+c0FNE7kg==
ajv-keywords@^2.1.0:
version "2.1.1"
@@ -524,15 +524,15 @@ atob@^2.1.1:
integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
autoprefixer@^9.0.0, autoprefixer@~9.4:
- version "9.4.3"
- resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.3.tgz#c97384a8fd80477b78049163a91bbc725d9c41d9"
- integrity sha512-/XSnzDepRkAU//xLcXA/lUWxpsBuw0WiriAHOqnxkuCtzLhaz+fL4it4gp20BQ8n5SyLzK/FOc7A0+u/rti2FQ==
+ version "9.4.4"
+ resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.4.tgz#40c42b335bdb22efe8cd80389ca82ffb5e32d68d"
+ integrity sha512-7tpjBadJyHKf+gOJEmKhZIksWxdZCSrnKbbTJNsw+/zX9+f//DLELRQPWjjjVoDbbWlCuNRkN7RfmZwDVgWMLw==
dependencies:
- browserslist "^4.3.6"
- caniuse-lite "^1.0.30000921"
+ browserslist "^4.3.7"
+ caniuse-lite "^1.0.30000926"
normalize-range "^0.1.2"
num2fraction "^1.2.2"
- postcss "^7.0.6"
+ postcss "^7.0.7"
postcss-value-parser "^3.3.1"
babel-code-frame@^6.22.0:
@@ -847,14 +847,14 @@ browserify@~16.2:
vm-browserify "^1.0.0"
xtend "^4.0.0"
-browserslist@^4.0.0, browserslist@^4.3.6:
- version "4.3.6"
- resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.3.6.tgz#0f9d9081afc66b36f477c6bdf3813f784f42396a"
- integrity sha512-kMGKs4BTzRWviZ8yru18xBpx+CyHG9eqgRbj9XbE3IMgtczf4aiA0Y1YCpVdvUieKGZ03kolSPXqTcscBCb9qw==
+browserslist@^4.0.0, browserslist@^4.3.7:
+ version "4.3.7"
+ resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.3.7.tgz#f1de479a6466ea47a0a26dcc725e7504817e624a"
+ integrity sha512-pWQv51Ynb0MNk9JGMCZ8VkM785/4MQNXiFYtPqI7EEP0TJO+/d/NqRVn1uiAN0DNbnlUSpL2sh16Kspasv3pUQ==
dependencies:
- caniuse-lite "^1.0.30000921"
- electron-to-chromium "^1.3.92"
- node-releases "^1.1.1"
+ caniuse-lite "^1.0.30000925"
+ electron-to-chromium "^1.3.96"
+ node-releases "^1.1.3"
buffer-alloc-unsafe@^1.1.0:
version "1.1.0"
@@ -1037,10 +1037,10 @@ caniuse-api@^3.0.0:
lodash.memoize "^4.1.2"
lodash.uniq "^4.5.0"
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000921:
- version "1.0.30000925"
- resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000925.tgz#f1a3b9aae2a83071b1eccfa39959d72440409b08"
- integrity sha512-zcYupoUxtW46rOikuDF7vfL9N1Qe9ZuUBTz3n3q8fFsoJIs/h9UN6Vg/0QpjsmvImXw9mVc3g+ZBfqvUz/iALA==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000925, caniuse-lite@^1.0.30000926:
+ version "1.0.30000926"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000926.tgz#4361a99d818ca6e521dbe89a732de62a194a789c"
+ integrity sha512-diMkEvxfFw09SkbErCLmw/1Fx1ZZe9xfWm4aeA2PUffB48x1tfZeMsK5j4BW7zN7Y4PdqmPVVdG2eYjE5IRTag==
caw@^2.0.0, caw@^2.0.1:
version "2.0.1"
@@ -1827,7 +1827,7 @@ default-resolution@^2.0.0:
resolved "https://registry.yarnpkg.com/default-resolution/-/default-resolution-2.0.0.tgz#bcb82baa72ad79b426a76732f1a81ad6df26d684"
integrity sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=
-define-properties@^1.1.2:
+define-properties@^1.1.2, define-properties@^1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
@@ -2070,7 +2070,7 @@ ee-first@1.1.1:
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
-electron-to-chromium@^1.3.92:
+electron-to-chromium@^1.3.96:
version "1.3.96"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.96.tgz#25770ec99b8b07706dedf3a5f43fa50cb54c4f9a"
integrity sha512-ZUXBUyGLeoJxp4Nt6G/GjBRLnyz8IKQGexZ2ndWaoegThgMGFO1tdDYID5gBV32/1S83osjJHyfzvanE/8HY4Q==
@@ -2120,18 +2120,19 @@ error@^7.0.0:
string-template "~0.2.1"
xtend "~4.0.0"
-es-abstract@^1.5.1, es-abstract@^1.6.1:
- version "1.12.0"
- resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.12.0.tgz#9dbbdd27c6856f0001421ca18782d786bf8a6165"
- integrity sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==
+es-abstract@^1.12.0, es-abstract@^1.5.1:
+ version "1.13.0"
+ resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
+ integrity sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==
dependencies:
- es-to-primitive "^1.1.1"
+ es-to-primitive "^1.2.0"
function-bind "^1.1.1"
- has "^1.0.1"
- is-callable "^1.1.3"
+ has "^1.0.3"
+ is-callable "^1.1.4"
is-regex "^1.0.4"
+ object-keys "^1.0.12"
-es-to-primitive@^1.1.1:
+es-to-primitive@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377"
integrity sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==
@@ -2878,7 +2879,7 @@ fsevents@^1.2.2:
nan "^2.9.2"
node-pre-gyp "^0.10.0"
-function-bind@^1.1.0, function-bind@^1.1.1:
+function-bind@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
@@ -3015,7 +3016,7 @@ glob-watcher@^5.0.0:
just-debounce "^1.0.0"
object.defaults "^1.1.0"
-glob@^7.0.5, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2:
+glob@^7.1.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3:
version "7.1.3"
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
@@ -3365,7 +3366,7 @@ has-values@^1.0.0:
is-number "^3.0.0"
kind-of "^4.0.0"
-has@^1.0.0, has@^1.0.1:
+has@^1.0.0, has@^1.0.1, has@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
@@ -3793,7 +3794,7 @@ is-builtin-module@^1.0.0:
dependencies:
builtin-modules "^1.0.0"
-is-callable@^1.1.3, is-callable@^1.1.4:
+is-callable@^1.1.4:
version "1.1.4"
resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==
@@ -4834,7 +4835,7 @@ node-pre-gyp@^0.10.0:
semver "^5.3.0"
tar "^4"
-node-releases@^1.1.1:
+node-releases@^1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.3.tgz#aad9ce0dcb98129c753f772c0aa01360fb90fbd2"
integrity sha512-6VrvH7z6jqqNFY200kdB6HdzkgM96Oaj9v3dqGfgp6mF+cHmU4wyQKZ2/WPDRVoR0Jz9KqbamaBN0ZhdUaysUQ==
@@ -5030,14 +5031,14 @@ object.reduce@^1.0.0:
make-iterator "^1.0.0"
object.values@^1.0.4:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.0.4.tgz#e524da09b4f66ff05df457546ec72ac99f13069a"
- integrity sha1-5STaCbT2b/Bd9FdUbscqyZ8TBpo=
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.0.tgz#bf6810ef5da3e5325790eaaa2be213ea84624da9"
+ integrity sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==
dependencies:
- define-properties "^1.1.2"
- es-abstract "^1.6.1"
- function-bind "^1.1.0"
- has "^1.0.1"
+ define-properties "^1.1.3"
+ es-abstract "^1.12.0"
+ function-bind "^1.1.1"
+ has "^1.0.3"
on-finished@~2.3.0:
version "2.3.0"
@@ -5862,7 +5863,7 @@ postcss-values-parser@^2.0.0:
indexes-of "^1.0.1"
uniq "^1.0.1"
-postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.3, postcss@^7.0.5, postcss@^7.0.6, postcss@^7.0.7:
+postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.3, postcss@^7.0.5, postcss@^7.0.7, postcss@~7.0:
version "7.0.7"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.7.tgz#2754d073f77acb4ef08f1235c36c5721a7201614"
integrity sha512-HThWSJEPkupqew2fnuQMEI2YcTj/8gMV3n80cMdJsKxfIh5tHf7nM5JigNX6LxVMqo6zkgQNAI88hyFvBk41Pg==
@@ -6404,12 +6405,7 @@ resolve-url@^0.2.1:
resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
-resolve@1.1.7:
- version "1.1.7"
- resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
- integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
-
-resolve@^1.1.4, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.6.0, resolve@^1.8.1:
+resolve@1.1.7, resolve@^1.1.4, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.6.0, resolve@^1.8.1, resolve@~1.9:
version "1.9.0"
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.9.0.tgz#a14c6fdfa8f92a7df1d996cb7105fa744658ea06"
integrity sha512-TZNye00tI67lwYvzxCxHGjwTNlUV70io54/Ed4j6PscB8xVfuBJpRenI/o6dVk0cY0PYTY27AgCoGGxRnYuItQ==
@@ -6447,11 +6443,11 @@ rgba-regex@^1.0.0:
integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=
rimraf@^2.5.4, rimraf@^2.6.1, rimraf@~2.6.2:
- version "2.6.2"
- resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
- integrity sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==
+ version "2.6.3"
+ resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
+ integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
dependencies:
- glob "^7.0.5"
+ glob "^7.1.3"
ripemd160@^2.0.0, ripemd160@^2.0.1:
version "2.0.2"
@@ -7538,7 +7534,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.2.0:
+undertaker@^1.0.0, undertaker@~1.2:
version "1.2.0"
resolved "https://registry.yarnpkg.com/undertaker/-/undertaker-1.2.0.tgz#339da4646252d082dc378e708067299750e11b49"
integrity sha1-M52kZGJS0ILcN45wgGcpl1DhG0k=
[camel-website] 07/07: CAMEL-11500: for PnP to work we need Yarn 13+
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 9391ce8f353c7760a9693de6ea8c99e9398fff90
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Fri Jan 4 13:15:52 2019 +0100
CAMEL-11500: for PnP to work we need Yarn 13+
Yarn 13+ patches `resolve` module to resolve from PnP[1].
[1] https://github.com/yarnpkg/yarn/pull/6816
---
.dockerignore | 1 +
Dockerfile | 25 +++++++++++++++++++++++++
Jenkinsfile | 9 ++++-----
3 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..91224e5
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1 @@
+**/*
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..6348063
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,25 @@
+FROM node:lts-stretch
+
+ENV YARN_VERSION 1.13.0
+
+RUN set -ex \
+ && apt-get update \
+ && apt-get install -y --no-install-recommends \
+ libasound2 \
+ libatk-bridge2.0-0 \
+ libgtk-3-0 \
+ libnss3 \
+ libx11-xcb1 \
+ libxss1 \
+ libxtst6 \
+ && rm -rf /var/lib/apt/lists/*
+
+RUN set -ex \
+ && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
+ && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
+ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
+ && mkdir -p /opt \
+ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \
+ && ln -fs /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
+ && ln -fs /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
+&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz
diff --git a/Jenkinsfile b/Jenkinsfile
index e7f5010..32829f8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,6 @@
* under the License.
*/
def NODE = 'git-websites'
-def NODE_IMAGE = 'circleci/node:11-browsers'
pipeline {
agent {
@@ -42,9 +41,9 @@ pipeline {
stages {
stage('Theme') {
agent {
- docker {
+ dockerfile {
+ dir 'camel-website'
label "$NODE"
- image "$NODE_IMAGE"
reuseNode true
}
}
@@ -57,9 +56,9 @@ pipeline {
stage('Website') {
agent {
- docker {
+ dockerfile {
+ dir 'camel-website'
label "$NODE"
- image "$NODE_IMAGE"
reuseNode true
}
}
[camel-website] 05/07: CAMEL-11500: for theme only default gulp
task i...
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 26b263e9c13f2015e0002361e8ad637b1747ae4d
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Fri Jan 4 12:15:34 2019 +0100
CAMEL-11500: for theme only default gulp task i...
...s needed
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 72de3be..e7f5010 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -51,7 +51,7 @@ 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"
+ sh "cd $WORKSPACE/camel-website/antora-ui-camel && yarn --non-interactive gulp"
}
}