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 12:17:19 UTC
[camel-website] branch pnp updated (d4f2bbe -> 886eb85)
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 d4f2bbe CAMEL-11500: for PnP to work we need Yarn 13+
new 886eb85 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 (d4f2bbe)
\
N -- N -- N refs/heads/pnp (886eb85)
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 1 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:
Jenkinsfile | 8 --------
1 file changed, 8 deletions(-)
[camel-website] 01/01: 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 886eb8531bd34ebf4040fa80c5bd60737473c7e8
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
---
Dockerfile | 13 +++++++++++++
Jenkinsfile | 13 ++-----------
2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..dea5f55
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,13 @@
+FROM node:lts-stretch
+
+ENV YARN_VERSION 1.13.0
+
+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..5699f62 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,11 +41,7 @@ pipeline {
stages {
stage('Theme') {
agent {
- docker {
- label "$NODE"
- image "$NODE_IMAGE"
- reuseNode true
- }
+ dockerfile true
}
steps {
@@ -57,11 +52,7 @@ pipeline {
stage('Website') {
agent {
- docker {
- label "$NODE"
- image "$NODE_IMAGE"
- reuseNode true
- }
+ dockerfile true
}
steps {