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/06/15 05:48:00 UTC
[calcite] branch test-site updated (168ecd6 -> 56cbfc2)
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 168ecd6 Add Jenkinsfile for automated site build
new 56cbfc2 Add Jenkinsfile for automated site build
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 (168ecd6)
\
N -- N -- N refs/heads/test-site (56cbfc2)
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 | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
[calcite] 01/01: 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 56cbfc25400a3c192d3df79bb8a80d5c1881235c
Author: Francis Chuang <fr...@apache.org>
AuthorDate: Sun Jun 9 15:40:40 2019 +1000
Add Jenkinsfile for automated site build
---
Jenkinsfile | 58 +++++++++++++++++++++++++++++++++++++++++++++++++
site/docker-compose.yml | 2 +-
2 files changed, 59 insertions(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 0000000..ba5a367
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,58 @@
+pipeline {
+ agent {
+ node {
+ label 'git-websites'
+ }
+ }
+
+ environment {
+ COMPOSE_PROJECT_NAME = "${env.JOB_NAME}-${env.BUILD_ID}"
+ }
+
+ options {
+ timeout(time: 20, unit: 'MINUTES')
+ }
+
+ stages {
+ stage('Build Site') {
+ when {
+ branch 'test-site'
+ }
+ steps {
+ dir ("site") {
+ sh '''
+ docker-compose run -d -e JEKYLL_UID=$(id -u) -e JEKYLL_GID=$(id -g) build-site
+ containerID=$(docker-compose ps -q build-site)
+
+ while $(docker inspect -f '{{.State.Running}}' $containerID) != "false"; do
+ sleep 1
+ done
+
+ docker logs $containerID
+ '''
+ }
+ echo "Website assets built."
+ }
+ }
+
+ stage('Deploy Site') {
+ when {
+ branch 'test-site'
+ }
+ steps {
+ echo 'Deploying website to git repository'
+ dir ("site/target") {
+ sh '''
+ git init
+ git remote add origin https://github.com/apache/calcite-site
+ git reset origin/master --soft
+
+ git reset -- apidocs/
+
+ '''
+ }
+ echo "Deployment completed."
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/site/docker-compose.yml b/site/docker-compose.yml
index 13b808c..d85b842 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