From d002fb0f2db4c34ca1deee2003813be4b6c6db4d Mon Sep 17 00:00:00 2001 From: William Cheng Date: Fri, 6 Mar 2020 15:48:26 +0800 Subject: [PATCH 1/4] test dart2 in circle ci (jdk7) --- CI/.drone.yml | 13 +++++++------ CI/circle_parallel.sh | 19 +++++++++++++++++-- pom.xml | 3 +++ 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/CI/.drone.yml b/CI/.drone.yml index 04523009a088..ad8bb2fa2d53 100644 --- a/CI/.drone.yml +++ b/CI/.drone.yml @@ -18,13 +18,14 @@ steps: image: haskell:8.6.5 commands: - (cd samples/client/petstore/haskell-http-client/ && stack --install-ghc --no-haddock-deps haddock --fast && stack test --fast) +# below dart tests moved to circle ci # test Dart 2.x petstore client -- name: dart2x-test - image: google/dart - commands: - - (cd samples/client/petstore/dart-jaguar/openapi && pub get && pub run build_runner build --delete-conflicting-outputs) - - (cd samples/client/petstore/dart-jaguar/flutter_petstore/openapi && pub get && pub run build_runner build --delete-conflicting-outputs) - - (cd samples/client/petstore/dart2/petstore && pub get && pub run test) +#- name: dart2x-test +# image: google/dart +# commands: +# - (cd samples/client/petstore/dart-jaguar/openapi && pub get && pub run build_runner build --delete-conflicting-outputs) +# - (cd samples/client/petstore/dart-jaguar/flutter_petstore/openapi && pub get && pub run build_runner build --delete-conflicting-outputs) +# - (cd samples/client/petstore/dart2/petstore && pub get && pub run test) # test Java 11 HTTP client - name: java11-test image: openjdk:11.0 diff --git a/CI/circle_parallel.sh b/CI/circle_parallel.sh index 913ef4754c42..82805e64cdb8 100755 --- a/CI/circle_parallel.sh +++ b/CI/circle_parallel.sh @@ -9,8 +9,16 @@ set -e if [ "$NODE_INDEX" = "1" ]; then echo "Running node $NODE_INDEX to test 'samples.circleci' defined in pom.xml ..." - #cp CI/pom.xml.circleci pom.xml java -version + + # install dart2 + sudo apt-get update + sudo apt-get install apt-transport-https + sudo sh -c 'wget -qO- https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -' + sudo sh -c 'wget -qO- https://storage.googleapis.com/download.dartlang.org/linux/debian/dart_stable.list > /etc/apt/sources.list.d/dart_stable.list' + sudo apt-get install dart + export PATH="$PATH:/usr/lib/dart/bin" + mvn --quiet verify -Psamples.circleci -Dorg.slf4j.simpleLogger.defaultLogLevel=error mvn --quiet javadoc:javadoc -Psamples.circleci -Dorg.slf4j.simpleLogger.defaultLogLevel=error @@ -46,13 +54,20 @@ elif [ "$NODE_INDEX" = "2" ]; then # install curl sudo apt-get -y build-dep libcurl4-gnutls-dev sudo apt-get -y install libcurl4-gnutls-dev + + # install dart2 + sudo apt-get install apt-transport-https + sudo sh -c 'wget -qO- https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -' + sudo sh -c 'wget -qO- https://storage.googleapis.com/download.dartlang.org/linux/debian/dart_stable.list > /etc/apt/sources.list.d/dart_stable.list' + sudo apt-get install dart + export PATH="$PATH:/usr/lib/dart/bin" + # run integration tests mvn --quiet verify -Psamples.misc -Dorg.slf4j.simpleLogger.defaultLogLevel=error else echo "Running node $NODE_INDEX to test 'samples.circleci.jdk7' defined in pom.xml ..." sudo update-java-alternatives -s java-1.7.0-openjdk-amd64 java -version - #cp CI/pom.xml.circleci.java7 pom.xml mvn --quiet verify -Psamples.circleci.jdk7 -Dorg.slf4j.simpleLogger.defaultLogLevel=error fi diff --git a/pom.xml b/pom.xml index bbf7ee1ecf66..eb094907adae 100644 --- a/pom.xml +++ b/pom.xml @@ -1384,6 +1384,9 @@ samples/openapi3/client/petstore/ruby + samples/client/petstore/dart2/petstore + samples/client/petstore/dart-jaguar/openapi + samples/client/petstore/dart-jaguar/flutter_petstore/openapi samples/client/petstore/scala-httpclient samples/client/petstore/scalaz samples/client/petstore/java/feign From bac4c355e16aeb8514038ac2b8899c7aa4366fc6 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Fri, 6 Mar 2020 16:49:06 +0800 Subject: [PATCH 2/4] fix tests --- CI/circle_parallel.sh | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/CI/circle_parallel.sh b/CI/circle_parallel.sh index 82805e64cdb8..b10c3c2d61cb 100755 --- a/CI/circle_parallel.sh +++ b/CI/circle_parallel.sh @@ -11,14 +11,6 @@ if [ "$NODE_INDEX" = "1" ]; then echo "Running node $NODE_INDEX to test 'samples.circleci' defined in pom.xml ..." java -version - # install dart2 - sudo apt-get update - sudo apt-get install apt-transport-https - sudo sh -c 'wget -qO- https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -' - sudo sh -c 'wget -qO- https://storage.googleapis.com/download.dartlang.org/linux/debian/dart_stable.list > /etc/apt/sources.list.d/dart_stable.list' - sudo apt-get install dart - export PATH="$PATH:/usr/lib/dart/bin" - mvn --quiet verify -Psamples.circleci -Dorg.slf4j.simpleLogger.defaultLogLevel=error mvn --quiet javadoc:javadoc -Psamples.circleci -Dorg.slf4j.simpleLogger.defaultLogLevel=error @@ -55,6 +47,13 @@ elif [ "$NODE_INDEX" = "2" ]; then sudo apt-get -y build-dep libcurl4-gnutls-dev sudo apt-get -y install libcurl4-gnutls-dev + # run integration tests + mvn --quiet verify -Psamples.misc -Dorg.slf4j.simpleLogger.defaultLogLevel=error +else + echo "Running node $NODE_INDEX to test 'samples.circleci.jdk7' defined in pom.xml ..." + sudo update-java-alternatives -s java-1.7.0-openjdk-amd64 + java -version + # install dart2 sudo apt-get install apt-transport-https sudo sh -c 'wget -qO- https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -' @@ -62,12 +61,6 @@ elif [ "$NODE_INDEX" = "2" ]; then sudo apt-get install dart export PATH="$PATH:/usr/lib/dart/bin" - # run integration tests - mvn --quiet verify -Psamples.misc -Dorg.slf4j.simpleLogger.defaultLogLevel=error -else - echo "Running node $NODE_INDEX to test 'samples.circleci.jdk7' defined in pom.xml ..." - sudo update-java-alternatives -s java-1.7.0-openjdk-amd64 - java -version mvn --quiet verify -Psamples.circleci.jdk7 -Dorg.slf4j.simpleLogger.defaultLogLevel=error fi From 0d842d3a7fcb1abee507da03a68f2914f1169ec2 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Fri, 6 Mar 2020 18:30:21 +0800 Subject: [PATCH 3/4] update package --- CI/circle_parallel.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/CI/circle_parallel.sh b/CI/circle_parallel.sh index b10c3c2d61cb..7e34bb92bb32 100755 --- a/CI/circle_parallel.sh +++ b/CI/circle_parallel.sh @@ -55,6 +55,7 @@ else java -version # install dart2 + sudo apt-get update sudo apt-get install apt-transport-https sudo sh -c 'wget -qO- https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -' sudo sh -c 'wget -qO- https://storage.googleapis.com/download.dartlang.org/linux/debian/dart_stable.list > /etc/apt/sources.list.d/dart_stable.list' From e0a3a436829a60c42ee8d152552d57b5fac71f8d Mon Sep 17 00:00:00 2001 From: William Cheng Date: Fri, 6 Mar 2020 21:16:09 +0800 Subject: [PATCH 4/4] fix dart installation --- CI/circle_parallel.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/CI/circle_parallel.sh b/CI/circle_parallel.sh index 7e34bb92bb32..c28cd709ea0f 100755 --- a/CI/circle_parallel.sh +++ b/CI/circle_parallel.sh @@ -59,6 +59,7 @@ else sudo apt-get install apt-transport-https sudo sh -c 'wget -qO- https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -' sudo sh -c 'wget -qO- https://storage.googleapis.com/download.dartlang.org/linux/debian/dart_stable.list > /etc/apt/sources.list.d/dart_stable.list' + sudo apt-get update sudo apt-get install dart export PATH="$PATH:/usr/lib/dart/bin"