You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by fr...@apache.org on 2019/07/14 05:43:54 UTC
[calcite] branch test-site updated (bc4b7e8 -> 5f3b287)
This is an automated email from the ASF dual-hosted git repository.
francischuang pushed a change to branch test-site
in repository https://gitbox.apache.org/repos/asf/calcite.git.
discard bc4b7e8 Site: Change timezone offsets for posts to UTC (+0)
discard 3ee40c3 Add Jenkinsfile for automated site build
new 279e248 [CALCITE-3129] Add Jenkinsfile for automated site build
new 5f3b287 Site: Change timezone offsets for posts to UTC (+0)
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 (bc4b7e8)
\
N -- N -- N refs/heads/test-site (5f3b287)
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 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:
Jenkinsfile | 60 +++++-------------------------------------------------------
1 file changed, 5 insertions(+), 55 deletions(-)
[calcite] 01/02: [CALCITE-3129] Add Jenkinsfile for automated site
build
Posted by fr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
francischuang pushed a commit to branch test-site
in repository https://gitbox.apache.org/repos/asf/calcite.git
commit 279e248d971233dda32264881286532942638273
Author: Francis Chuang <fr...@apache.org>
AuthorDate: Sun Jun 9 15:40:40 2019 +1000
[CALCITE-3129] Add Jenkinsfile for automated site build
---
Jenkinsfile | 79 +++++++++++++++++++++++++++++++++++++++++++++++++
site/_config.yml | 2 ++
site/docker-compose.yml | 6 +++-
3 files changed, 86 insertions(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 0000000..da0e1d0
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,79 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to you under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+pipeline {
+ agent {
+ node {
+ label 'git-websites'
+ }
+ }
+
+ environment {
+ COMPOSE_PROJECT_NAME = "${env.JOB_NAME}-${env.BUILD_ID}"
+ }
+
+ options {
+ timeout(time: 40, unit: 'MINUTES')
+ }
+
+ stages {
+ stage('Build Site') {
+ when {
+ branch 'test-site'
+ }
+ steps {
+ dir ("site") {
+ sh '''docker-compose run -e JEKYLL_UID=$(id -u) -e JEKYLL_GID=$(id -g) build-site
+ docker-compose run -d -u $(id -u):$(id -g) generate-javadoc
+ '''
+ }
+ echo "Website assets and javadoc built."
+ }
+ }
+
+ stage('Deploy Site') {
+ when {
+ branch 'test-site'
+ }
+ steps {
+ echo 'Deploying to git repository'
+ dir ("site") {
+ sh '''
+ shopt -s extglob
+
+ git clone --depth 1 --branch asf-site https://gitbox.apache.org/repos/asf/calcite-site.git deploy
+ cd deploy/
+
+ rm -rf !(apidocs|avatica|testapidocs)
+ cp -r ../target/* .
+ cp -r ../target/apidocs .
+ cp -r ../target/testapidocs .
+
+ git add .
+ git commit -m "Automatic site deployment at $GIT_COMMIT"
+ git push origin HEAD:asf-site
+ '''
+ }
+ echo "Deployment completed."
+ }
+ }
+ }
+ post {
+ always {
+ sh 'docker system prune --force --all'
+ }
+ }
+}
\ No newline at end of file
diff --git a/site/_config.yml b/site/_config.yml
index 08427ff..f79761b 100644
--- a/site/_config.yml
+++ b/site/_config.yml
@@ -53,4 +53,6 @@ avaticaBaseurl: /avatica
plugins:
- jekyll-redirect-from
+future: true
+
# End _config.yml
diff --git a/site/docker-compose.yml b/site/docker-compose.yml
index 13b808c..f975655 100644
--- a/site/docker-compose.yml
+++ b/site/docker-compose.yml
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-version: '3'
+version: '3.7'
services:
dev:
image: jekyll/jekyll:3
@@ -22,11 +22,15 @@ services:
- 4000:4000
volumes:
- .:/srv/jekyll
+ environment:
+ TZ: "UTC"
build-site:
image: jekyll/jekyll:3
command: jekyll build
volumes:
- .:/srv/jekyll
+ environment:
+ TZ: "UTC"
generate-javadoc:
image: maven
working_dir: /usr/src/calcite
[calcite] 02/02: Site: Change timezone offsets for posts to UTC (+0)
Posted by fr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
francischuang pushed a commit to branch test-site
in repository https://gitbox.apache.org/repos/asf/calcite.git
commit 5f3b287761cfc680a26aeea6920273405a71412e
Author: Francis Chuang <fr...@apache.org>
AuthorDate: Mon Jun 17 10:51:29 2019 +1000
Site: Change timezone offsets for posts to UTC (+0)
---
site/_config.yml | 2 ++
site/_posts/2014-06-27-release-0.8.0-incubating.md | 2 +-
site/_posts/2014-08-19-release-0.9.0-incubating.md | 2 +-
site/_posts/2014-10-02-release-0.9.1-incubating.md | 2 +-
site/_posts/2014-11-05-release-0.9.2-incubating.md | 2 +-
site/_posts/2015-01-31-release-1.0.0-incubating.md | 2 +-
site/_posts/2015-03-13-release-1.1.0-incubating.md | 2 +-
site/_posts/2015-04-07-release-1.2.0-incubating.md | 2 +-
site/_posts/2015-04-24-new-committers.md | 2 +-
site/_posts/2015-06-05-algebra-builder.md | 2 +-
site/_posts/2015-07-31-xldb-best-lightning-talk.md | 2 +-
site/_posts/2015-11-08-new-committers.md | 2 +-
site/_posts/2016-02-17-elser-pmc.md | 2 +-
site/_posts/2016-02-17-streaming-sql-talk.md | 2 +-
14 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/site/_config.yml b/site/_config.yml
index f79761b..26cc781 100644
--- a/site/_config.yml
+++ b/site/_config.yml
@@ -55,4 +55,6 @@ plugins:
future: true
+timezone: UTC
+
# End _config.yml
diff --git a/site/_posts/2014-06-27-release-0.8.0-incubating.md b/site/_posts/2014-06-27-release-0.8.0-incubating.md
index 83f975d..bfb01da 100644
--- a/site/_posts/2014-06-27-release-0.8.0-incubating.md
+++ b/site/_posts/2014-06-27-release-0.8.0-incubating.md
@@ -1,6 +1,6 @@
---
layout: news_item
-date: "2014-06-27 00:00:00 -0800"
+date: "2014-06-27 00:00:00 +0000"
author: jhyde
version: 0.8
tag: v0-8
diff --git a/site/_posts/2014-08-19-release-0.9.0-incubating.md b/site/_posts/2014-08-19-release-0.9.0-incubating.md
index 7ca65ac..356f6e5 100644
--- a/site/_posts/2014-08-19-release-0.9.0-incubating.md
+++ b/site/_posts/2014-08-19-release-0.9.0-incubating.md
@@ -1,6 +1,6 @@
---
layout: news_item
-date: "2014-08-19 00:00:00 -0800"
+date: "2014-08-19 00:00:00 +0000"
author: jhyde
version: 0.9.0-incubating
fullVersion: apache-optiq-0.9.0-incubating
diff --git a/site/_posts/2014-10-02-release-0.9.1-incubating.md b/site/_posts/2014-10-02-release-0.9.1-incubating.md
index bca9113..38e1843 100644
--- a/site/_posts/2014-10-02-release-0.9.1-incubating.md
+++ b/site/_posts/2014-10-02-release-0.9.1-incubating.md
@@ -1,6 +1,6 @@
---
layout: news_item
-date: "2014-10-02 00:00:00 -0800"
+date: "2014-10-02 00:00:00 +0000"
author: jhyde
version: 0.9.1-incubating
tag: v0-9-1
diff --git a/site/_posts/2014-11-05-release-0.9.2-incubating.md b/site/_posts/2014-11-05-release-0.9.2-incubating.md
index 47741c0..69045a3 100644
--- a/site/_posts/2014-11-05-release-0.9.2-incubating.md
+++ b/site/_posts/2014-11-05-release-0.9.2-incubating.md
@@ -1,6 +1,6 @@
---
layout: news_item
-date: "2014-11-05 00:00:00 -0800"
+date: "2014-11-05 00:00:00 +0000"
author: jhyde
version: 0.9.2-incubating
tag: v0-9-2
diff --git a/site/_posts/2015-01-31-release-1.0.0-incubating.md b/site/_posts/2015-01-31-release-1.0.0-incubating.md
index ad60205..a5f480f 100644
--- a/site/_posts/2015-01-31-release-1.0.0-incubating.md
+++ b/site/_posts/2015-01-31-release-1.0.0-incubating.md
@@ -1,6 +1,6 @@
---
layout: news_item
-date: "2015-01-31 19:03:07 -0800"
+date: "2015-01-31 19:03:07 +0000"
author: jhyde
version: 1.0.0-incubating
tag: v1-0-0
diff --git a/site/_posts/2015-03-13-release-1.1.0-incubating.md b/site/_posts/2015-03-13-release-1.1.0-incubating.md
index 327b023..543f763 100644
--- a/site/_posts/2015-03-13-release-1.1.0-incubating.md
+++ b/site/_posts/2015-03-13-release-1.1.0-incubating.md
@@ -1,6 +1,6 @@
---
layout: news_item
-date: "2015-03-13 19:03:07 -0800"
+date: "2015-03-13 19:03:07 +0000"
author: jhyde
version: 1.1.0-incubating
tag: v1-1-0
diff --git a/site/_posts/2015-04-07-release-1.2.0-incubating.md b/site/_posts/2015-04-07-release-1.2.0-incubating.md
index 8332063..348175d 100644
--- a/site/_posts/2015-04-07-release-1.2.0-incubating.md
+++ b/site/_posts/2015-04-07-release-1.2.0-incubating.md
@@ -1,6 +1,6 @@
---
layout: news_item
-date: "2015-04-07 19:03:07 -0800"
+date: "2015-04-07 19:03:07 +0000"
author: jhyde
version: 1.2.0-incubating
tag: v1-2-0
diff --git a/site/_posts/2015-04-24-new-committers.md b/site/_posts/2015-04-24-new-committers.md
index 92a2466..51198fa 100644
--- a/site/_posts/2015-04-24-new-committers.md
+++ b/site/_posts/2015-04-24-new-committers.md
@@ -1,7 +1,7 @@
---
layout: news_item
title: "Calcite adds 5 committers"
-date: "2015-04-24 19:03:07 -0800"
+date: "2015-04-24 19:03:07 +0000"
author: jhyde
categories: [team]
---
diff --git a/site/_posts/2015-06-05-algebra-builder.md b/site/_posts/2015-06-05-algebra-builder.md
index ddf3377..797b1c9 100644
--- a/site/_posts/2015-06-05-algebra-builder.md
+++ b/site/_posts/2015-06-05-algebra-builder.md
@@ -1,7 +1,7 @@
---
layout: news_item
title: "Algebra builder"
-date: "2015-06-05 19:29:07 -0800"
+date: "2015-06-05 19:29:07 +0000"
author: jhyde
categories: ["new features"]
---
diff --git a/site/_posts/2015-07-31-xldb-best-lightning-talk.md b/site/_posts/2015-07-31-xldb-best-lightning-talk.md
index b0e1f46..6d4aa34 100644
--- a/site/_posts/2015-07-31-xldb-best-lightning-talk.md
+++ b/site/_posts/2015-07-31-xldb-best-lightning-talk.md
@@ -1,7 +1,7 @@
---
layout: news_item
title: "XLDB 2015 best lightning talk"
-date: "2015-07-31 11:53:00 -0800"
+date: "2015-07-31 11:53:00 +0000"
author: jhyde
categories: ["talks"]
---
diff --git a/site/_posts/2015-11-08-new-committers.md b/site/_posts/2015-11-08-new-committers.md
index 8946fc5..10fc61b 100644
--- a/site/_posts/2015-11-08-new-committers.md
+++ b/site/_posts/2015-11-08-new-committers.md
@@ -1,7 +1,7 @@
---
layout: news_item
title: "Calcite adds 2 committers"
-date: "2015-11-08 19:03:07 -0800"
+date: "2015-11-08 19:03:07 +0000"
author: jhyde
categories: [team]
---
diff --git a/site/_posts/2016-02-17-elser-pmc.md b/site/_posts/2016-02-17-elser-pmc.md
index 960fe79..27631b8 100644
--- a/site/_posts/2016-02-17-elser-pmc.md
+++ b/site/_posts/2016-02-17-elser-pmc.md
@@ -1,7 +1,7 @@
---
layout: news_item
title: "Calcite appoints Josh Elser to PMC"
-date: "2016-02-17 10:30:00 -0800"
+date: "2016-02-17 10:30:00 +0000"
author: jhyde
categories: [team]
---
diff --git a/site/_posts/2016-02-17-streaming-sql-talk.md b/site/_posts/2016-02-17-streaming-sql-talk.md
index 9c5d55a..5760427 100644
--- a/site/_posts/2016-02-17-streaming-sql-talk.md
+++ b/site/_posts/2016-02-17-streaming-sql-talk.md
@@ -1,7 +1,7 @@
---
layout: news_item
title: "Streaming SQL in Samza"
-date: "2016-02-17 11:53:00 -0800"
+date: "2016-02-17 11:53:00 +0000"
author: jhyde
categories: ["talks"]
---