Skip to content

Commit 6c996a7

Browse files
authored
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
1 parent 5630746 commit 6c996a7

8 files changed

Lines changed: 64 additions & 24 deletions

File tree

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ cache:
2828
- $HOME/samples/server/petstore/rust-server/target
2929
- $HOME/perl5
3030
- $HOME/.cargo
31+
- $HOME/.stack
3132

3233
services:
3334
- docker

CI/pom.xml.circleci

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -833,6 +833,8 @@
833833
</activation>
834834
<modules>
835835
<!-- clients -->
836+
<!-- test non-java projects -->
837+
<module>samples/client/petstore/go</module>
836838
<!-- test java-related projects -->
837839
<module>samples/client/petstore/akka-scala</module>
838840
<module>samples/client/petstore/scala</module>
@@ -855,8 +857,6 @@
855857
<module>samples/client/petstore/kotlin/</module>
856858
<module>samples/client/petstore/kotlin-threetenbp/</module>
857859
<module>samples/client/petstore/kotlin-string/</module>
858-
<!-- test non-java projects -->
859-
<module>samples/client/petstore/go</module>
860860
<!-- servers -->
861861
<module>samples/server/petstore/java-vertx/rx</module>
862862
<module>samples/server/petstore/java-vertx/async</module>
@@ -873,19 +873,21 @@
873873
<module>samples/server/petstore/java-play-framework-api-package-override</module>
874874
<module>samples/server/petstore/undertow</module>
875875
<module>samples/server/petstore/jaxrs/jersey1</module>
876-
<module>samples/server/petstore/jaxrs/jersey2</module>
877876
<module>samples/server/petstore/jaxrs/jersey1-useTags</module>
878-
<module>samples/server/petstore/jaxrs/jersey2-useTags</module>
877+
<!-- move to other CI as the following fails often in CircleCI
878+
<module>samples/server/petstore/jaxrs/jersey2</module>
879+
<module>samples/server/petstore/jaxrs/jersey2-useTags</module> -->
879880
<module>samples/server/petstore/jaxrs-datelib-j8</module>
880881
<module>samples/server/petstore/jaxrs-resteasy/default</module>
881882
<module>samples/server/petstore/jaxrs-resteasy/eap</module>
882883
<module>samples/server/petstore/jaxrs-resteasy/eap-joda</module>
883884
<module>samples/server/petstore/jaxrs-resteasy/eap-java8</module>
884885
<module>samples/server/petstore/jaxrs-resteasy/joda</module>
885886
<!--<module>samples/server/petstore/kotlin-server/ktor</module>-->
887+
<!-- move to other CI as the following fails often in CircleCI
886888
<module>samples/server/petstore/spring-mvc</module>
887889
<module>samples/server/petstore/spring-mvc-j8-async</module>
888-
<module>samples/server/petstore/spring-mvc-j8-localdatetime</module>
890+
<module>samples/server/petstore/spring-mvc-j8-localdatetime</module>-->
889891
<module>samples/client/petstore/spring-cloud</module>
890892
<module>samples/server/petstore/springboot</module>
891893
<module>samples/server/petstore/springboot-beanvalidation</module>
@@ -898,6 +900,7 @@
898900
<module>samples/server/petstore/jaxrs-spec-interface</module>
899901
<module>samples/server/petstore/scala-lagom-server</module>
900902
<module>samples/server/petstore/scalatra</module>
903+
<module>samples/server/petstore/finch</module>
901904
</modules>
902905
</profile>
903906
</profiles>
Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,21 @@ echo "Please press CTRL+C to stop or the script will continue in 5 seconds."
1010
sleep 5
1111

1212
# LIST OF SCRIPTS:
13-
./bin/ruby-petstore.sh
14-
./bin/java-petstore-all.sh
15-
./bin/java-jaxrs-petstore-server-all.sh
16-
./bin/spring-all-pestore.sh
17-
./bin/kotlin-client-petstore.sh
18-
./bin/kotlin-client-string.sh
19-
./bin/kotlin-client-threetenbp.sh
20-
./bin/kotlin-server-petstore.sh
21-
./bin/php-petstore.sh
22-
./bin/php-silex-petstore-server.sh
23-
./bin/php-symfony-petstore.sh
24-
./bin/php-lumen-petstore-server.sh
25-
./bin/php-slim-petstore-server.sh
26-
./bin/php-ze-ph-petstore-server.sh
27-
./bin/openapi3/php-petstore.sh
13+
./bin/ruby-petstore.sh > /dev/null 2>&1
14+
./bin/java-petstore-all.sh > /dev/null 2>&1
15+
./bin/java-jaxrs-petstore-server-all.sh > /dev/null 2>&1
16+
./bin/spring-all-pestore.sh > /dev/null 2>&1
17+
./bin/kotlin-client-petstore.sh > /dev/null 2>&1
18+
./bin/kotlin-client-string.sh > /dev/null 2>&1
19+
./bin/kotlin-client-threetenbp.sh > /dev/null 2>&1
20+
./bin/kotlin-server-petstore.shl> /dev/null 2>&1
21+
./bin/php-petstore.sh > /dev/null 2>&1
22+
./bin/php-silex-petstore-server.shj> /dev/null 2>&1
23+
./bin/php-symfony-petstore.sh > /dev/null 2>&1
24+
./bin/php-lumen-petstore-server.sh > /dev/null 2>&1
25+
./bin/php-slim-petstore-server.sh > /dev/null 2>&1
26+
./bin/php-ze-ph-petstore-server.sh > /dev/null 2>&1
27+
./bin/openapi3/php-petstore.sh > /dev/null 2>&1
2828

2929
# Check:
3030
if [ -n "$(git status --porcelain)" ]; then

circle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies:
1515
cache_directories:
1616
- "~/.m2"
1717
- "~/.sbt"
18-
- "~/.ivy2/cache"
18+
- "~/.ivy2"
1919

2020
pre:
2121
- sudo add-apt-repository ppa:duggan/bats --yes

pom.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -935,10 +935,14 @@
935935
<modules>
936936
<!-- clients -->
937937
<module>samples/client/petstore/elixir</module>
938-
<!--<module>samples/client/petstore/haskell-http-client</module>-->
939938
<module>samples/client/petstore/erlang-client</module>
940939
<!-- servers -->
941940
<module>samples/server/petstore/erlang-server</module>
941+
<module>samples/server/petstore/jaxrs/jersey2</module>
942+
<module>samples/server/petstore/jaxrs/jersey2-useTags</module>
943+
<module>samples/server/petstore/spring-mvc</module>
944+
<module>samples/server/petstore/spring-mvc-j8-async</module>
945+
<module>samples/server/petstore/spring-mvc-j8-localdatetime</module>
942946
</modules>
943947
</profile>
944948
</profiles>
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<project>
2+
<modelVersion>4.0.0</modelVersion>
3+
<groupId>org.openapitools</groupId>
4+
<artifactId>finch-server</artifactId>
5+
<packaging>pom</packaging>
6+
<version>1.0-SNAPSHOT</version>
7+
<name>Finch server</name>
8+
<build>
9+
<plugins>
10+
<plugin>
11+
<groupId>org.codehaus.mojo</groupId>
12+
<artifactId>exec-maven-plugin</artifactId>
13+
<version>1.5.0</version>
14+
<executions>
15+
<execution>
16+
<id>sbt-test</id>
17+
<phase>integration-test</phase>
18+
<goals>
19+
<goal>exec</goal>
20+
</goals>
21+
<configuration>
22+
<executable>sbt</executable>
23+
<arguments>
24+
<argument>test</argument>
25+
</arguments>
26+
</configuration>
27+
</execution>
28+
</executions>
29+
</plugin>
30+
</plugins>
31+
</build>
32+
</project>

samples/server/petstore/scalatra/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<project>
22
<modelVersion>4.0.0</modelVersion>
3-
<groupId>io.swagger</groupId>
3+
<groupId>org.openapitools</groupId>
44
<artifactId>scalatra-server</artifactId>
55
<packaging>pom</packaging>
66
<version>1.0-SNAPSHOT</version>

shippable.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ build:
1212
ci:
1313
- mvn --quiet clean install
1414
# ensure all modifications created by 'mature' generators are in the git repo
15-
- ./bin/ensure-up-to-date
15+
- ./bin/utils/ensure-up-to-date
1616
# prepare enviroment for tests
1717
- sudo apt-get update -qq
1818
# install stack

0 commit comments

Comments
 (0)