Various improvement to CI (#326)

* Various improvement to CI

* trigger a failure

* disable ensure up-to-date script

* move ensure-up-to-date under bin/utils, pipe update to /dev/null
This commit is contained in:
William Cheng 2018-06-15 16:18:31 +08:00 committed by GitHub
parent 5630746794
commit 6c996a7d1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 64 additions and 24 deletions

View File

@ -28,6 +28,7 @@ cache:
- $HOME/samples/server/petstore/rust-server/target - $HOME/samples/server/petstore/rust-server/target
- $HOME/perl5 - $HOME/perl5
- $HOME/.cargo - $HOME/.cargo
- $HOME/.stack
services: services:
- docker - docker

View File

@ -833,6 +833,8 @@
</activation> </activation>
<modules> <modules>
<!-- clients --> <!-- clients -->
<!-- test non-java projects -->
<module>samples/client/petstore/go</module>
<!-- test java-related projects --> <!-- test java-related projects -->
<module>samples/client/petstore/akka-scala</module> <module>samples/client/petstore/akka-scala</module>
<module>samples/client/petstore/scala</module> <module>samples/client/petstore/scala</module>
@ -855,8 +857,6 @@
<module>samples/client/petstore/kotlin/</module> <module>samples/client/petstore/kotlin/</module>
<module>samples/client/petstore/kotlin-threetenbp/</module> <module>samples/client/petstore/kotlin-threetenbp/</module>
<module>samples/client/petstore/kotlin-string/</module> <module>samples/client/petstore/kotlin-string/</module>
<!-- test non-java projects -->
<module>samples/client/petstore/go</module>
<!-- servers --> <!-- servers -->
<module>samples/server/petstore/java-vertx/rx</module> <module>samples/server/petstore/java-vertx/rx</module>
<module>samples/server/petstore/java-vertx/async</module> <module>samples/server/petstore/java-vertx/async</module>
@ -873,9 +873,10 @@
<module>samples/server/petstore/java-play-framework-api-package-override</module> <module>samples/server/petstore/java-play-framework-api-package-override</module>
<module>samples/server/petstore/undertow</module> <module>samples/server/petstore/undertow</module>
<module>samples/server/petstore/jaxrs/jersey1</module> <module>samples/server/petstore/jaxrs/jersey1</module>
<module>samples/server/petstore/jaxrs/jersey2</module>
<module>samples/server/petstore/jaxrs/jersey1-useTags</module> <module>samples/server/petstore/jaxrs/jersey1-useTags</module>
<module>samples/server/petstore/jaxrs/jersey2-useTags</module> <!-- move to other CI as the following fails often in CircleCI
<module>samples/server/petstore/jaxrs/jersey2</module>
<module>samples/server/petstore/jaxrs/jersey2-useTags</module> -->
<module>samples/server/petstore/jaxrs-datelib-j8</module> <module>samples/server/petstore/jaxrs-datelib-j8</module>
<module>samples/server/petstore/jaxrs-resteasy/default</module> <module>samples/server/petstore/jaxrs-resteasy/default</module>
<module>samples/server/petstore/jaxrs-resteasy/eap</module> <module>samples/server/petstore/jaxrs-resteasy/eap</module>
@ -883,9 +884,10 @@
<module>samples/server/petstore/jaxrs-resteasy/eap-java8</module> <module>samples/server/petstore/jaxrs-resteasy/eap-java8</module>
<module>samples/server/petstore/jaxrs-resteasy/joda</module> <module>samples/server/petstore/jaxrs-resteasy/joda</module>
<!--<module>samples/server/petstore/kotlin-server/ktor</module>--> <!--<module>samples/server/petstore/kotlin-server/ktor</module>-->
<!-- move to other CI as the following fails often in CircleCI
<module>samples/server/petstore/spring-mvc</module> <module>samples/server/petstore/spring-mvc</module>
<module>samples/server/petstore/spring-mvc-j8-async</module> <module>samples/server/petstore/spring-mvc-j8-async</module>
<module>samples/server/petstore/spring-mvc-j8-localdatetime</module> <module>samples/server/petstore/spring-mvc-j8-localdatetime</module>-->
<module>samples/client/petstore/spring-cloud</module> <module>samples/client/petstore/spring-cloud</module>
<module>samples/server/petstore/springboot</module> <module>samples/server/petstore/springboot</module>
<module>samples/server/petstore/springboot-beanvalidation</module> <module>samples/server/petstore/springboot-beanvalidation</module>
@ -898,6 +900,7 @@
<module>samples/server/petstore/jaxrs-spec-interface</module> <module>samples/server/petstore/jaxrs-spec-interface</module>
<module>samples/server/petstore/scala-lagom-server</module> <module>samples/server/petstore/scala-lagom-server</module>
<module>samples/server/petstore/scalatra</module> <module>samples/server/petstore/scalatra</module>
<module>samples/server/petstore/finch</module>
</modules> </modules>
</profile> </profile>
</profiles> </profiles>

View File

@ -10,21 +10,21 @@ echo "Please press CTRL+C to stop or the script will continue in 5 seconds."
sleep 5 sleep 5
# LIST OF SCRIPTS: # LIST OF SCRIPTS:
./bin/ruby-petstore.sh ./bin/ruby-petstore.sh > /dev/null 2>&1
./bin/java-petstore-all.sh ./bin/java-petstore-all.sh > /dev/null 2>&1
./bin/java-jaxrs-petstore-server-all.sh ./bin/java-jaxrs-petstore-server-all.sh > /dev/null 2>&1
./bin/spring-all-pestore.sh ./bin/spring-all-pestore.sh > /dev/null 2>&1
./bin/kotlin-client-petstore.sh ./bin/kotlin-client-petstore.sh > /dev/null 2>&1
./bin/kotlin-client-string.sh ./bin/kotlin-client-string.sh > /dev/null 2>&1
./bin/kotlin-client-threetenbp.sh ./bin/kotlin-client-threetenbp.sh > /dev/null 2>&1
./bin/kotlin-server-petstore.sh ./bin/kotlin-server-petstore.shl> /dev/null 2>&1
./bin/php-petstore.sh ./bin/php-petstore.sh > /dev/null 2>&1
./bin/php-silex-petstore-server.sh ./bin/php-silex-petstore-server.shj> /dev/null 2>&1
./bin/php-symfony-petstore.sh ./bin/php-symfony-petstore.sh > /dev/null 2>&1
./bin/php-lumen-petstore-server.sh ./bin/php-lumen-petstore-server.sh > /dev/null 2>&1
./bin/php-slim-petstore-server.sh ./bin/php-slim-petstore-server.sh > /dev/null 2>&1
./bin/php-ze-ph-petstore-server.sh ./bin/php-ze-ph-petstore-server.sh > /dev/null 2>&1
./bin/openapi3/php-petstore.sh ./bin/openapi3/php-petstore.sh > /dev/null 2>&1
# Check: # Check:
if [ -n "$(git status --porcelain)" ]; then if [ -n "$(git status --porcelain)" ]; then

View File

@ -15,7 +15,7 @@ dependencies:
cache_directories: cache_directories:
- "~/.m2" - "~/.m2"
- "~/.sbt" - "~/.sbt"
- "~/.ivy2/cache" - "~/.ivy2"
pre: pre:
- sudo add-apt-repository ppa:duggan/bats --yes - sudo add-apt-repository ppa:duggan/bats --yes

View File

@ -935,10 +935,14 @@
<modules> <modules>
<!-- clients --> <!-- clients -->
<module>samples/client/petstore/elixir</module> <module>samples/client/petstore/elixir</module>
<!--<module>samples/client/petstore/haskell-http-client</module>-->
<module>samples/client/petstore/erlang-client</module> <module>samples/client/petstore/erlang-client</module>
<!-- servers --> <!-- servers -->
<module>samples/server/petstore/erlang-server</module> <module>samples/server/petstore/erlang-server</module>
<module>samples/server/petstore/jaxrs/jersey2</module>
<module>samples/server/petstore/jaxrs/jersey2-useTags</module>
<module>samples/server/petstore/spring-mvc</module>
<module>samples/server/petstore/spring-mvc-j8-async</module>
<module>samples/server/petstore/spring-mvc-j8-localdatetime</module>
</modules> </modules>
</profile> </profile>
</profiles> </profiles>

View File

@ -0,0 +1,32 @@
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>org.openapitools</groupId>
<artifactId>finch-server</artifactId>
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
<name>Finch server</name>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.5.0</version>
<executions>
<execution>
<id>sbt-test</id>
<phase>integration-test</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>sbt</executable>
<arguments>
<argument>test</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@ -1,6 +1,6 @@
<project> <project>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>io.swagger</groupId> <groupId>org.openapitools</groupId>
<artifactId>scalatra-server</artifactId> <artifactId>scalatra-server</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>

View File

@ -12,7 +12,7 @@ build:
ci: ci:
- mvn --quiet clean install - mvn --quiet clean install
# ensure all modifications created by 'mature' generators are in the git repo # ensure all modifications created by 'mature' generators are in the git repo
- ./bin/ensure-up-to-date - ./bin/utils/ensure-up-to-date
# prepare enviroment for tests # prepare enviroment for tests
- sudo apt-get update -qq - sudo apt-get update -qq
# install stack # install stack