This is an automated email from the ASF dual-hosted git repository. hxd pushed a commit to branch optimize_travis in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 68325f816bd15ede4b3b67828af7e266619b5b27 Author: xiangdong huang <[email protected]> AuthorDate: Sun Apr 5 11:27:00 2020 +0800 revert site to do not use website profile --- .travis.yml | 6 +- Jenkinsfile | 2 +- site/README.md | 2 +- site/pom.xml | 691 ++++++++++++++++++++++++++++----------------------------- 4 files changed, 348 insertions(+), 353 deletions(-) diff --git a/.travis.yml b/.travis.yml index 80eb436..b2ac1e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -139,7 +139,7 @@ matrix: jdk: openjdk8 script: # now, grafana has no tests; spark-* tests are written by scala - - mvn post-integration-test -Pcode-coverage -Pcoveralls + - mvn post-integration-test -Pcode-coverage -Pcoveralls -pl '!site','!distribution' -am - mvn coveralls:report -Dservice_name=travis_ci -pl '!grafana','!spark-iotdb-connector','!spark-tsfile','!distribution','!site' -am #- mvn coveralls:report -Dservice_name=travis_ci -Pcoveralls - os: linux @@ -147,7 +147,7 @@ matrix: dist: xenial jdk: openjdk8 script: - - mvn clean package -pl site -Pwebsite + - mvn clean package -pl site cache: directories: @@ -170,7 +170,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 + - mvn -B clean test integration-test -pl '!site' -am # Killing background sleep loop - kill %1 diff --git a/Jenkinsfile b/Jenkinsfile index 291d926..d5ae674 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -147,7 +147,7 @@ pipeline { } steps { // Publish the site with the scm-publish plugin. - sh 'mvn package scm-publish:publish-scm -pl site -Pwebsite' + sh 'mvn package scm-publish:publish-scm -pl site' // Clean up the snapshots directory (freeing up more space after deploying). dir("target") { diff --git a/site/README.md b/site/README.md index da7d80b..87b7325 100644 --- a/site/README.md +++ b/site/README.md @@ -27,7 +27,7 @@ See https://iotdb.apache.org/ ## Build Setup -run `mvn package -DskipTests -Pwebsite` for: +run `mvn package -DskipTests -pl site` for: - get docs from the master branch and all lagecy docs remotely. - download node.js and npm; diff --git a/site/pom.xml b/site/pom.xml index 0ded820..8f4a0c5 100644 --- a/site/pom.xml +++ b/site/pom.xml @@ -37,358 +37,353 @@ <url>scm:git:https://gitbox.apache.org/repos/asf/incubator-iotdb-website.git</url> </site> </distributionManagement> - <profiles> - <profile> - <id>website</id> - <build> - <plugins> - <!-- copy source codes into vue required folders--> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <execution> - <id>copy-source-code-to-docs-folder</id> - <!-- here the phase you need --> - <phase>generate-sources</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/vue-source/src</outputDirectory> - <!-- output directory --> - <resources> - <resource> - <directory>${basedir}/src/main/</directory> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - <!-- Copy master documents--> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <execution> - <id>copy-master-docs-to-docs</id> - <!-- here the phase you need --> - <phase>generate-sources</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/vue-source/src</outputDirectory> - <!-- output directory --> - <resources> - <resource> - <directory>${basedir}/../docs</directory> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> - <execution> - <id>copy-other-md-files-to-development</id> - <!-- here the phase you need --> - <phase>generate-sources</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/vue-source/src/Development</outputDirectory> - <!-- output directory --> - <resources> - <resource> - <directory>${basedir}/../tsfile</directory> - <includes> - <include>format-changelist.md</include> - </includes> - </resource> - <resource> - <directory>${basedir}/../service-rpc</directory> - <includes> - <include>rpc-changelist.md</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - <execution> - <id>copy-other-md-files-to-zh-development</id> - <!-- here the phase you need --> - <phase>generate-sources</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/vue-source/src/zh/Development</outputDirectory> - <!-- output directory --> - <resources> - <resource> - <directory>${basedir}/../tsfile</directory> - <includes> - <include>format-changelist.md</include> - </includes> - </resource> - <resource> - <directory>${basedir}/../service-rpc</directory> - <includes> - <include>rpc-changelist.md</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - <!-- mv UserGuide of master into master folder --> - <plugin> - <groupId>com.coderplus.maven.plugins</groupId> - <artifactId>copy-rename-maven-plugin</artifactId> - <version>1.0</version> - <executions> - <execution> - <id>copy-package-json</id> - <phase>generate-sources</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <fileSets> - <fileSet> - <sourceFile>${basedir}/src/main/package.json</sourceFile> - <destinationFile>${project.build.directory}/vue-source/package.json</destinationFile> - </fileSet> - <fileSet> - <sourceFile>${basedir}/src/main/deploy.js</sourceFile> - <destinationFile>${project.build.directory}/vue-source/deploy.js</destinationFile> - </fileSet> - </fileSets> - </configuration> - </execution> - <execution> - <id>mv-master-userguide-to-tmp-folder</id> - <phase>generate-sources</phase> - <goals> - <goal>rename</goal> - </goals> - <configuration> - <sourceFile>${project.build.directory}/vue-source/src/UserGuide</sourceFile> - <destinationFile>${project.build.directory}/vue-source/src/tmpUserGuide/master</destinationFile> - </configuration> - </execution> - <execution> - <id>mv-master-zh-userguide-to-tmp-folder</id> - <phase>generate-sources</phase> - <goals> - <goal>rename</goal> - </goals> - <configuration> - <sourceFile>${project.build.directory}/vue-source/src/zh/UserGuide</sourceFile> - <destinationFile>${project.build.directory}/vue-source/src/zh/tmpUserGuide/master</destinationFile> - </configuration> - </execution> - </executions> - </plugin> - <!-- download lagecy docs from iotdb repo --> - <plugin> - <groupId>com.googlecode.maven-download-plugin</groupId> - <artifactId>download-maven-plugin</artifactId> - <version>1.3.0</version> - <executions> - <execution> - <id>get-0.9-docs</id> - <phase>generate-sources</phase> - <goals> - <goal>wget</goal> - </goals> - <configuration> - <url>https://github.com/apache/incubator-iotdb/archive/rel/0.9.zip</url> - <outputDirectory>${project.build.directory}/download</outputDirectory> - <outputFileName>0.9.x.zip</outputFileName> - </configuration> - </execution> - <execution> - <id>get-0.8-docs</id> - <phase>generate-sources</phase> - <goals> - <goal>wget</goal> - </goals> - <configuration> - <url>https://github.com/apache/incubator-iotdb/archive/rel/0.8.zip</url> - <outputDirectory>${project.build.directory}/download</outputDirectory> - <outputFileName>0.8.x.zip</outputFileName> - </configuration> - </execution> - </executions> - </plugin> - <!-- unpack lagecy docs from the zip files--> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>truezip-maven-plugin</artifactId> - <version>1.2</version> - <inherited>false</inherited> - <executions> - <execution> - <id>copy-0.9-documentation</id> - <goals> - <goal>copy</goal> - </goals> - <phase>generate-sources</phase> - <configuration> - <fileset> - <directory>${project.build.directory}/download/0.9.x.zip/incubator-iotdb-rel-0.9/docs/UserGuide</directory> - <outputDirectory>${project.build.directory}/vue-source/src/UserGuide/V0.9.x</outputDirectory> - </fileset> - </configuration> - </execution> - <execution> - <id>copy-0.9-zh-documentation</id> - <goals> - <goal>copy</goal> - </goals> - <phase>generate-sources</phase> - <configuration> - <fileset> - <directory>${project.build.directory}/download/0.9.x.zip/incubator-iotdb-rel-0.9/docs/zh/UserGuide</directory> - <outputDirectory>${project.build.directory}/vue-source/src/zh/UserGuide/V0.9.x</outputDirectory> - </fileset> - </configuration> - </execution> - <execution> - <id>copy-0.8-documentation</id> - <goals> - <goal>copy</goal> - </goals> - <phase>generate-sources</phase> - <configuration> - <fileset> - <directory>${project.build.directory}/download/0.8.x.zip/incubator-iotdb-rel-0.8/docs/UserGuide</directory> - <outputDirectory>${project.build.directory}/vue-source/src/UserGuide/V0.8.x</outputDirectory> - </fileset> - </configuration> - </execution> - <execution> - <id>copy-0.8-zh-documentation</id> - <goals> - <goal>copy</goal> - </goals> - <phase>generate-sources</phase> - <configuration> - <fileset> - <directory>${project.build.directory}/download/0.8.x.zip/incubator-iotdb-rel-0.8/docs/zh/UserGuide</directory> - <outputDirectory>${project.build.directory}/vue-source/src/zh/UserGuide/V0.8.x</outputDirectory> - </fileset> - </configuration> - </execution> - </executions> - </plugin> - <!-- mv UserGuide of master back --> - <plugin> - <groupId>com.coderplus.maven.plugins</groupId> - <artifactId>copy-rename-maven-plugin</artifactId> - <version>1.0</version> - <executions> - <execution> - <id>mv-master-userguide-to-docs</id> - <phase>generate-sources</phase> - <goals> - <goal>rename</goal> - </goals> - <configuration> - <sourceFile>${project.build.directory}/vue-source/src/tmpUserGuide</sourceFile> - <destinationFile>${project.build.directory}/vue-source/src/UserGuide</destinationFile> - </configuration> - </execution> - <execution> - <id>mv-master-zh-userguide-to-docs</id> - <phase>generate-sources</phase> - <goals> - <goal>rename</goal> - </goals> - <configuration> - <sourceFile>${project.build.directory}/vue-source/src/zh/tmpUserGuide</sourceFile> - <destinationFile>${project.build.directory}/vue-source/src/zh/UserGuide</destinationFile> - </configuration> - </execution> - </executions> - </plugin> - <!--install node and npm， then run `npm install` and `npm run build`--> - <plugin> - <groupId>com.github.eirslett</groupId> - <artifactId>frontend-maven-plugin</artifactId> - <version>1.9.1</version> + <build> + <plugins> + <!-- copy source codes into vue required folders--> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <execution> + <id>copy-source-code-to-docs-folder</id> + <!-- here the phase you need --> + <phase>generate-sources</phase> + <goals> + <goal>copy-resources</goal> + </goals> <configuration> - <installDirectory>${project.build.directory}/tools</installDirectory> - <workingDirectory>${project.build.directory}/vue-source</workingDirectory> + <outputDirectory>${project.build.directory}/vue-source/src</outputDirectory> + <!-- output directory --> + <resources> + <resource> + <directory>${basedir}/src/main/</directory> + <filtering>true</filtering> + </resource> + </resources> </configuration> - <executions> - <execution> - <id>install-node-and-npm</id> - <goals> - <goal>install-node-and-npm</goal> - </goals> - <phase>package</phase> - <configuration> - <nodeVersion>v11.5.0</nodeVersion> - <npmVersion>6.4.1</npmVersion> - </configuration> - </execution> - <!-- Install all project dependencies --> - <execution> - <id>npm install</id> - <goals> - <goal>npm</goal> - </goals> - <!-- optional: default phase is "generate-resources" --> - <phase>package</phase> - <!-- Optional configuration which provides for running any npm command --> - <configuration> - <arguments>install</arguments> - </configuration> - </execution> - <!-- Build and minify static files --> - <execution> - <id>npm run build</id> - <phase>package</phase> - <goals> - <goal>npm</goal> - </goals> - <configuration> - <arguments>run build</arguments> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-scm-publish-plugin</artifactId> + </execution> + </executions> + </plugin> + <!-- Copy master documents--> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <execution> + <id>copy-master-docs-to-docs</id> + <!-- here the phase you need --> + <phase>generate-sources</phase> + <goals> + <goal>copy-resources</goal> + </goals> <configuration> - <!-- mono-module doesn't require site:stage --> - <content>${project.build.directory}/vue-source/src/.vuepress/dist</content> - <!-- branch where to deploy --> - <scmBranch>asf-site</scmBranch> + <outputDirectory>${project.build.directory}/vue-source/src</outputDirectory> + <!-- output directory --> + <resources> + <resource> + <directory>${basedir}/../docs</directory> + <filtering>true</filtering> + </resource> + </resources> </configuration> - </plugin> - <plugin> - <groupId>org.simplify4u.plugins</groupId> - <artifactId>sitemapxml-maven-plugin</artifactId> + </execution> + <execution> + <id>copy-other-md-files-to-development</id> + <!-- here the phase you need --> + <phase>generate-sources</phase> + <goals> + <goal>copy-resources</goal> + </goals> <configuration> - <siteOutputDirectory>${project.build.directory}/vue-source/src/.vuepress/dist</siteOutputDirectory> - <maxDepth>5</maxDepth> + <outputDirectory>${project.build.directory}/vue-source/src/Development</outputDirectory> + <!-- output directory --> + <resources> + <resource> + <directory>${basedir}/../tsfile</directory> + <includes> + <include>format-changelist.md</include> + </includes> + </resource> + <resource> + <directory>${basedir}/../service-rpc</directory> + <includes> + <include>rpc-changelist.md</include> + </includes> + </resource> + </resources> </configuration> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>gen</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> + </execution> + <execution> + <id>copy-other-md-files-to-zh-development</id> + <!-- here the phase you need --> + <phase>generate-sources</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/vue-source/src/zh/Development</outputDirectory> + <!-- output directory --> + <resources> + <resource> + <directory>${basedir}/../tsfile</directory> + <includes> + <include>format-changelist.md</include> + </includes> + </resource> + <resource> + <directory>${basedir}/../service-rpc</directory> + <includes> + <include>rpc-changelist.md</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <!-- mv UserGuide of master into master folder --> + <plugin> + <groupId>com.coderplus.maven.plugins</groupId> + <artifactId>copy-rename-maven-plugin</artifactId> + <version>1.0</version> + <executions> + <execution> + <id>copy-package-json</id> + <phase>generate-sources</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <fileSets> + <fileSet> + <sourceFile>${basedir}/src/main/package.json</sourceFile> + <destinationFile>${project.build.directory}/vue-source/package.json</destinationFile> + </fileSet> + <fileSet> + <sourceFile>${basedir}/src/main/deploy.js</sourceFile> + <destinationFile>${project.build.directory}/vue-source/deploy.js</destinationFile> + </fileSet> + </fileSets> + </configuration> + </execution> + <execution> + <id>mv-master-userguide-to-tmp-folder</id> + <phase>generate-sources</phase> + <goals> + <goal>rename</goal> + </goals> + <configuration> + <sourceFile>${project.build.directory}/vue-source/src/UserGuide</sourceFile> + <destinationFile>${project.build.directory}/vue-source/src/tmpUserGuide/master</destinationFile> + </configuration> + </execution> + <execution> + <id>mv-master-zh-userguide-to-tmp-folder</id> + <phase>generate-sources</phase> + <goals> + <goal>rename</goal> + </goals> + <configuration> + <sourceFile>${project.build.directory}/vue-source/src/zh/UserGuide</sourceFile> + <destinationFile>${project.build.directory}/vue-source/src/zh/tmpUserGuide/master</destinationFile> + </configuration> + </execution> + </executions> + </plugin> + <!-- download lagecy docs from iotdb repo --> + <plugin> + <groupId>com.googlecode.maven-download-plugin</groupId> + <artifactId>download-maven-plugin</artifactId> + <version>1.3.0</version> + <executions> + <execution> + <id>get-0.9-docs</id> + <phase>generate-sources</phase> + <goals> + <goal>wget</goal> + </goals> + <configuration> + <url>https://github.com/apache/incubator-iotdb/archive/rel/0.9.zip</url> + <outputDirectory>${project.build.directory}/download</outputDirectory> + <outputFileName>0.9.x.zip</outputFileName> + </configuration> + </execution> + <execution> + <id>get-0.8-docs</id> + <phase>generate-sources</phase> + <goals> + <goal>wget</goal> + </goals> + <configuration> + <url>https://github.com/apache/incubator-iotdb/archive/rel/0.8.zip</url> + <outputDirectory>${project.build.directory}/download</outputDirectory> + <outputFileName>0.8.x.zip</outputFileName> + </configuration> + </execution> + </executions> + </plugin> + <!-- unpack lagecy docs from the zip files--> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>truezip-maven-plugin</artifactId> + <version>1.2</version> + <inherited>false</inherited> + <executions> + <execution> + <id>copy-0.9-documentation</id> + <goals> + <goal>copy</goal> + </goals> + <phase>generate-sources</phase> + <configuration> + <fileset> + <directory>${project.build.directory}/download/0.9.x.zip/incubator-iotdb-rel-0.9/docs/UserGuide</directory> + <outputDirectory>${project.build.directory}/vue-source/src/UserGuide/V0.9.x</outputDirectory> + </fileset> + </configuration> + </execution> + <execution> + <id>copy-0.9-zh-documentation</id> + <goals> + <goal>copy</goal> + </goals> + <phase>generate-sources</phase> + <configuration> + <fileset> + <directory>${project.build.directory}/download/0.9.x.zip/incubator-iotdb-rel-0.9/docs/zh/UserGuide</directory> + <outputDirectory>${project.build.directory}/vue-source/src/zh/UserGuide/V0.9.x</outputDirectory> + </fileset> + </configuration> + </execution> + <execution> + <id>copy-0.8-documentation</id> + <goals> + <goal>copy</goal> + </goals> + <phase>generate-sources</phase> + <configuration> + <fileset> + <directory>${project.build.directory}/download/0.8.x.zip/incubator-iotdb-rel-0.8/docs/UserGuide</directory> + <outputDirectory>${project.build.directory}/vue-source/src/UserGuide/V0.8.x</outputDirectory> + </fileset> + </configuration> + </execution> + <execution> + <id>copy-0.8-zh-documentation</id> + <goals> + <goal>copy</goal> + </goals> + <phase>generate-sources</phase> + <configuration> + <fileset> + <directory>${project.build.directory}/download/0.8.x.zip/incubator-iotdb-rel-0.8/docs/zh/UserGuide</directory> + <outputDirectory>${project.build.directory}/vue-source/src/zh/UserGuide/V0.8.x</outputDirectory> + </fileset> + </configuration> + </execution> + </executions> + </plugin> + <!-- mv UserGuide of master back --> + <plugin> + <groupId>com.coderplus.maven.plugins</groupId> + <artifactId>copy-rename-maven-plugin</artifactId> + <version>1.0</version> + <executions> + <execution> + <id>mv-master-userguide-to-docs</id> + <phase>generate-sources</phase> + <goals> + <goal>rename</goal> + </goals> + <configuration> + <sourceFile>${project.build.directory}/vue-source/src/tmpUserGuide</sourceFile> + <destinationFile>${project.build.directory}/vue-source/src/UserGuide</destinationFile> + </configuration> + </execution> + <execution> + <id>mv-master-zh-userguide-to-docs</id> + <phase>generate-sources</phase> + <goals> + <goal>rename</goal> + </goals> + <configuration> + <sourceFile>${project.build.directory}/vue-source/src/zh/tmpUserGuide</sourceFile> + <destinationFile>${project.build.directory}/vue-source/src/zh/UserGuide</destinationFile> + </configuration> + </execution> + </executions> + </plugin> + <!--install node and npm， then run `npm install` and `npm run build`--> + <plugin> + <groupId>com.github.eirslett</groupId> + <artifactId>frontend-maven-plugin</artifactId> + <version>1.9.1</version> + <configuration> + <installDirectory>${project.build.directory}/tools</installDirectory> + <workingDirectory>${project.build.directory}/vue-source</workingDirectory> + </configuration> + <executions> + <execution> + <id>install-node-and-npm</id> + <goals> + <goal>install-node-and-npm</goal> + </goals> + <phase>package</phase> + <configuration> + <nodeVersion>v11.5.0</nodeVersion> + <npmVersion>6.4.1</npmVersion> + </configuration> + </execution> + <!-- Install all project dependencies --> + <execution> + <id>npm install</id> + <goals> + <goal>npm</goal> + </goals> + <!-- optional: default phase is "generate-resources" --> + <phase>package</phase> + <!-- Optional configuration which provides for running any npm command --> + <configuration> + <arguments>install</arguments> + </configuration> + </execution> + <!-- Build and minify static files --> + <execution> + <id>npm run build</id> + <phase>package</phase> + <goals> + <goal>npm</goal> + </goals> + <configuration> + <arguments>run build</arguments> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-scm-publish-plugin</artifactId> + <configuration> + <!-- mono-module doesn't require site:stage --> + <content>${project.build.directory}/vue-source/src/.vuepress/dist</content> + <!-- branch where to deploy --> + <scmBranch>asf-site</scmBranch> + </configuration> + </plugin> + <plugin> + <groupId>org.simplify4u.plugins</groupId> + <artifactId>sitemapxml-maven-plugin</artifactId> + <configuration> + <siteOutputDirectory>${project.build.directory}/vue-source/src/.vuepress/dist</siteOutputDirectory> + <maxDepth>5</maxDepth> + </configuration> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </project>
