From 42bb6b089ccac9bddbbbe4a73438e4b1efa22719 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sat, 2 Oct 2021 13:14:58 +0800 Subject: [PATCH 1/4] move ts, js tests to circleci --- .travis.yml | 22 ---------------------- pom.xml | 6 +++--- 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5761227d0a77..739b790a5486 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,28 +21,11 @@ cache: - $HOME/samples/client/petstore/php/OpenAPIToolsClient-php/vendor - $HOME/samples/client/petstore/ruby/vendor/bundle - $HOME/samples/client/petstore/python/.venv/ - - $HOME/samples/openapi3/client/petstore/typescript/tests/default/node_modules - - $HOME/samples/openapi3/client/petstore/typescript/tests/jquery/node_modules - - $HOME/samples/openapi3/client/petstore/typescript/tests/object_params/node_modules - - $HOME/samples/openapi3/client/petstore/typescript/tests/inversify/node_modules - - $HOME/samples/client/petstore/typescript-node/npm/node_modules - - $HOME/samples/client/petstore/typescript-node/npm/typings/ - - $HOME/samples/client/petstore/typescript-fetch/tests/default/node_modules - - $HOME/samples/client/petstore/typescript-fetch/tests/default/typings - - $HOME/samples/client/petstore/typescript-fetch/builds/default/node_modules - - $HOME/samples/client/petstore/typescript-fetch/builds/default/typings - - $HOME/samples/client/petstore/typescript-fetch/builds/es6-target/node_modules - - $HOME/samples/client/petstore/typescript-fetch/builds/es6-target/typings - - $HOME/samples/client/petstore/typescript-fetch/builds/with-npm-version/node_modules - - $HOME/samples/client/petstore/typescript-fetch/npm/with-npm-version/typings - - $HOME/samples/client/petstore/typescript-angular/node_modules - - $HOME/samples/client/petstore/typescript-angular/typings - $HOME/samples/server/petstore/rust-server/target - $HOME/perl5 - $HOME/.cargo - $HOME/.pub-cache - $HOME/samples/server/petstore/cpp-pistache/pistache - - $HOME/.npm - $HOME/.rvm/gems/ruby-2.4.1 - $HOME/website/node_modules/ - $HOME/.cache/deno @@ -87,11 +70,6 @@ before_install: - curl https://sh.rustup.rs -sSf | sh -s -- -y -v # required when sudo: required for the Ruby petstore tests - gem install bundler - - nvm install 12.20.0 - - nvm use 12.20.0 - - npm install -g typescript - - npm install -g npm - - npm config set registry http://registry.npmjs.org/ # set python 3.6.3 as default - source ~/virtualenv/python3.6/bin/activate # -- skip bash test to shorten build time diff --git a/pom.xml b/pom.xml index 3250c8bdf97a..41ebf661332e 100644 --- a/pom.xml +++ b/pom.xml @@ -1193,8 +1193,6 @@ - samples/client/petstore/typescript-axios/builds/with-npm-version - samples/client/petstore/typescript-axios/tests/default samples/client/petstore/crystal samples/server/petstore/python-aiohttp @@ -1221,7 +1219,6 @@ - samples/client/petstore/javascript-flowtyped samples/client/petstore/python-legacy samples/client/petstore/python-asyncio samples/client/petstore/python-tornado @@ -1358,6 +1355,7 @@ samples/client/petstore/go samples/openapi3/client/petstore/go + samples/client/petstore/javascript-flowtyped samples/client/petstore/javascript-es6 samples/client/petstore/javascript-promise-es6 samples/server/petstore/go-api-server @@ -1385,6 +1383,8 @@ samples/client/petstore/typescript-fetch/tests/default samples/client/petstore/typescript-node/npm samples/client/petstore/typescript-rxjs/builds/with-npm-version + samples/client/petstore/typescript-axios/builds/with-npm-version + samples/client/petstore/typescript-axios/tests/default From 5b7dca1a7a5a8748010f6dab482a1cbc26ac3422 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sat, 2 Oct 2021 14:32:07 +0800 Subject: [PATCH 2/4] set NODE_ENV --- CI/circle_parallel.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CI/circle_parallel.sh b/CI/circle_parallel.sh index e8a80f937897..f4f505784187 100755 --- a/CI/circle_parallel.sh +++ b/CI/circle_parallel.sh @@ -7,6 +7,8 @@ NODE_INDEX=${CIRCLE_NODE_INDEX:-0} set -e +export NODE_ENV=test + function cleanup { # Show logs of 'petstore.swagger' container to troubleshoot Unit Test failures, if any. docker logs petstore.swagger # container name specified in circle.yml @@ -20,9 +22,6 @@ if [ "$NODE_INDEX" = "1" ]; then mvn --no-snapshot-updates --quiet verify -Psamples.circleci -Dorg.slf4j.simpleLogger.defaultLogLevel=error - echo "show ivy2 cache" - ls -l /home/circleci/.ivy2/cache - elif [ "$NODE_INDEX" = "2" ]; then echo "Running node $NODE_INDEX to test haskell" # install haskell From ed1d5874729f3556e1214ee4940fb9215fd5522f Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sat, 2 Oct 2021 14:37:15 +0800 Subject: [PATCH 3/4] curl -k --- CI/circle_parallel.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CI/circle_parallel.sh b/CI/circle_parallel.sh index f4f505784187..3bc55c4e3b8d 100755 --- a/CI/circle_parallel.sh +++ b/CI/circle_parallel.sh @@ -25,7 +25,7 @@ if [ "$NODE_INDEX" = "1" ]; then elif [ "$NODE_INDEX" = "2" ]; then echo "Running node $NODE_INDEX to test haskell" # install haskell - curl -sSL https://get.haskellstack.org/ | sh + curl -sSLk https://get.haskellstack.org/ | sh stack upgrade stack --version # prepare r From 70992a284ddf6b088719ca1d72d210875e4504b2 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sat, 2 Oct 2021 15:36:36 +0800 Subject: [PATCH 4/4] comment out haskell installation --- CI/circle_parallel.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CI/circle_parallel.sh b/CI/circle_parallel.sh index 3bc55c4e3b8d..6e231909d613 100755 --- a/CI/circle_parallel.sh +++ b/CI/circle_parallel.sh @@ -25,9 +25,9 @@ if [ "$NODE_INDEX" = "1" ]; then elif [ "$NODE_INDEX" = "2" ]; then echo "Running node $NODE_INDEX to test haskell" # install haskell - curl -sSLk https://get.haskellstack.org/ | sh - stack upgrade - stack --version + #curl -sSLk https://get.haskellstack.org/ | sh + #stack upgrade + #stack --version # prepare r sudo sh -c 'echo "deb http://cran.rstudio.com/bin/linux/ubuntu trusty/" >> /etc/apt/sources.list' gpg --keyserver keyserver.ubuntu.com --recv-key E084DAB9