You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2020/03/30 07:42:42 UTC
[incubator-iotdb] branch site updated (da69440 -> 3abcc65)
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a change to branch site
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from da69440 fix incorrect urls in docs
new 28081be move the site compiling to package stage
new 3abcc65 add how to upload site manually
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 | 24 ++++++++++++++++++++++++
site/README.md | 4 +++-
site/pom.xml | 6 +++---
3 files changed, 30 insertions(+), 4 deletions(-)
[incubator-iotdb] 02/02: add how to upload site manually
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch site
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 3abcc6539b71bcd1e71c5472a9cc5aff752ba5f5
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Mon Mar 30 15:42:26 2020 +0800
add how to upload site manually
---
site/README.md | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/site/README.md b/site/README.md
index abd20ac..4e47d8b 100644
--- a/site/README.md
+++ b/site/README.md
@@ -52,7 +52,9 @@ All changes in the target folder will be ignored by Git.
## Deploy Manually
-Copy all files in dist/ folder to asf-site branch.
+run `mvn package scm-publish:publish-scm`.
+
+Apache ID and passwored is needed.
## Directory Structure
[incubator-iotdb] 01/02: move the site compiling to package stage
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch site
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 28081be13865fe8f49d3f6cd80e626af3cee7676
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Mon Mar 30 15:41:09 2020 +0800
move the site compiling to package stage
---
Jenkinsfile | 24 ++++++++++++++++++++++++
site/pom.xml | 6 +++---
2 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index ca7b1d9..efa6382 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -135,6 +135,30 @@ pipeline {
}
}
+ stage('Deploy site') {
+ when {
+ branch 'master'
+ }
+ // Only the nodes labeled 'git-websites' have the credentials to commit to the.
+ agent {
+ node {
+ label 'git-websites'
+ }
+ }
+ steps {
+ // Unstash the previously stashed site.
+ unstash 'incubator-iotdb-site'
+ // Publish the site with the scm-publish plugin.
+ sh 'mvn scm-publish:publish-scm -pl site'
+
+ // Clean up the snapshots directory (freeing up more space after deploying).
+ dir("target") {
+ deleteDir()
+ }
+ }
+ }
+
+
stage('Cleanup') {
steps {
echo 'Cleaning up the workspace'
diff --git a/site/pom.xml b/site/pom.xml
index 6d0aa35..78844a8 100644
--- a/site/pom.xml
+++ b/site/pom.xml
@@ -274,7 +274,7 @@
<goals>
<goal>install-node-and-npm</goal>
</goals>
- <phase>generate-resources</phase>
+ <phase>package</phase>
<configuration>
<nodeVersion>v11.5.0</nodeVersion>
<npmVersion>6.4.1</npmVersion>
@@ -287,7 +287,7 @@
<goal>npm</goal>
</goals>
<!-- optional: default phase is "generate-resources" -->
- <phase>generate-resources</phase>
+ <phase>package</phase>
<!-- Optional configuration which provides for running any npm command -->
<configuration>
<arguments>install</arguments>
@@ -296,7 +296,7 @@
<!-- Build and minify static files -->
<execution>
<id>npm run build</id>
- <phase>compile</phase>
+ <phase>package</phase>
<goals>
<goal>npm</goal>
</goals>