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/05/30 14:02:38 UTC
[incubator-iotdb] branch issue-728 created (now 1e3e5da)
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a change to branch issue-728
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
at 1e3e5da move site to a seperate profile
This branch includes the following new commits:
new 1e3e5da move site to a seperate profile
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.
[incubator-iotdb] 01/01: move site to a seperate profile
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch issue-728
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 1e3e5dafe547c304b18d742ec091e665b890fd73
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Sat May 30 22:01:18 2020 +0800
move site to a seperate profile
---
.travis.yml | 8 ++++----
Jenkinsfile | 42 +++++++++++++++++++++---------------------
pom.xml | 8 +++++++-
site/src/main/package.json | 2 +-
4 files changed, 33 insertions(+), 27 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 360409b..4da538e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -117,7 +117,7 @@ matrix:
token:
secure: "a2n2+MFfuOb3hsrw5vjiIUZzjt6S0j4YmRVrms6NVKF+EpEAWU/zOjzfccLGRr3VFUAlkoM2p578c/0DMMGew2oj3Yl1iJe2n35BWIV6r/psUKRUMdgMAogdshQzZGMYmY1XL2xA3ATu8cf4F8WoRAafd/S58JGQdTfsQ5svh31BxK0iuh+nMIZb4dYxO717dSVD45D9hoF5ROxdtTRbyAaXFPs5djxWrdzKw0J3e6a8m82K9FGcpy4pY9ct3ttbyEzGqMnzE4fhd3KgopFJj+3QdAi/3Cmkf1voxorQdCSbktl4PtlzMY/nxF6XETI2E4T+GLUVMw4iHiXCabqwOiudGnEj5DjNz6X5MVCOyj7lrFBTlDirGzv9fNpvQ2I47WOL8DzBJPqFwQ0nRAlbvcWVtE4aAqj8YF1QwwLxEIi4abDfOwaxGG2TOixQf627pvhh1o0RdEf9R6aRyur7vbM [...]
script:
- - mvn verify sonar:sonar -Dsonar.organization=apache -Dsonar.projectKey=apache_incubator-iotdb -DskipTests -pl '!site','!distribution' -am
+ - mvn verify sonar:sonar -Dsonar.organization=apache -Dsonar.projectKey=apache_incubator-iotdb -DskipTests -pl '!distribution' -am
- os: linux
if: fork = false #only fork=true (i.e., the committer has permission to write the repo)
name: code-coverage
@@ -133,7 +133,7 @@ matrix:
dist: xenial
jdk: openjdk8
script:
- - mvn clean package -pl site
+ - mvn -P site clean package -pl site
- os: windows
name: windows-website checker
language: c
@@ -152,7 +152,7 @@ matrix:
- export "M2_HOME=/c/mvn363/apache-maven-3.6.3"
- export "PATH=/c/mvn363/apache-maven-3.6.3/bin:$PATH"
script:
- - mvn clean package -pl site
+ - mvn -P site clean package -pl site
cache:
directories:
- '$HOME/.m2/repository'
@@ -174,7 +174,7 @@ script:
- mvn -B apache-rat:check
# Output something every 10 minutes or Travis kills the job
- while sleep 540; do echo "=====[ $SECONDS seconds still running ]====="; done &
- - mvn -B clean test integration-test -pl '!site' -am
+ - mvn -B clean test integration-test
# Killing background sleep loop
- kill %1
diff --git a/Jenkinsfile b/Jenkinsfile
index a4dcb25..7f3f712 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -117,7 +117,7 @@ pipeline {
// Then run the analysis
// 'my-sonarcloud-token' needs to be defined for this job and contains the user token
withCredentials([string(credentialsId: 'xiangdong-iotdb-sonarcloud-token', variable: 'SONAR_TOKEN')]) {
- sh "mvn verify sonar:sonar -Dsonar.branch.name=master -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=apache -Dsonar.projectKey=apache_incubator-iotdb -Dsonar.login=${SONAR_TOKEN} -DskipTests -pl '!site'"
+ sh "mvn verify sonar:sonar -Dsonar.branch.name=master -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=apache -Dsonar.projectKey=apache_incubator-iotdb -Dsonar.login=${SONAR_TOKEN} -DskipTests"
}
}
}
@@ -136,26 +136,26 @@ pipeline {
}
//temporary disable this stage because VUEPRESS takes too much memory
-// 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 {
-// // Publish the site with the scm-publish plugin.
-// sh 'mvn package scm-publish:publish-scm -pl site'
-//
-// // Clean up the snapshots directory (freeing up more space after deploying).
-// dir("target") {
-// deleteDir()
-// }
-// }
-// }
+ 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 {
+ // Publish the site with the scm-publish plugin.
+ sh 'mvn -P site package scm-publish:publish-scm -pl site'
+
+ // Clean up the snapshots directory (freeing up more space after deploying).
+ dir("target") {
+ deleteDir()
+ }
+ }
+ }
stage('Cleanup') {
diff --git a/pom.xml b/pom.xml
index b7dedf8..05b0a5b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,7 +94,6 @@
<module>flink-iotdb-connector</module>
<module>distribution</module>
<module>hive-connector</module>
- <module>site</module>
</modules>
<!-- Properties Management -->
<properties>
@@ -1223,5 +1222,12 @@
<!-- upload code coverage report to coveralls.io-->
<!-- to enable coveralls locally, you need to get the repoToken from https://coveralls.io/github/apache/incubator-iotdb.
use `mvn post-integration-test -Pcode-coverage -DrepoToken=TOKEN`-->
+ <!-- enable site--><!-- use `mvn package -P site -pl site` to compile the site module only -->
+ <profile>
+ <id>site</id>
+ <modules>
+ <module>site</module>
+ </modules>
+ </profile>
</profiles>
</project>
diff --git a/site/src/main/package.json b/site/src/main/package.json
index 98979c6..c0040da 100644
--- a/site/src/main/package.json
+++ b/site/src/main/package.json
@@ -37,7 +37,7 @@
"unified-engine": "^7.0.0",
"vfile-reporter": "^6.0.1",
"vue-tabs-component": "^1.5.0",
- "vuepress": "^1.3.1",
+ "vuepress": "^1.5.0",
"vuepress-plugin-tabs": "^0.3.0"
}
}