From e73316c013c04c62d5386f43a341930318ceb652 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Fri, 12 Apr 2019 11:48:13 +0800 Subject: [PATCH 1/7] update travis to test gradle plugin --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 4ea6e747895e..a60e2404f47e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -120,6 +120,8 @@ script: - /bin/bash ./bin/utils/detect_merge_conflict.sh # fail if generators contain tab '\t' - /bin/bash ./bin/utils/detect_tab_in_java_class.sh + # test gradle plug-in + - gradle -b modules/openapi-generator-gradle-plugin/samples/local-spec/build.gradle buildGoSdk --info # run integration tests defined in maven pom.xml - ./run-in-docker.sh mvn --quiet --batch-mode clean install - mvn --quiet --batch-mode verify -Psamples From 80d9a273a8b557c3a39fc82d71f3a11967e714df Mon Sep 17 00:00:00 2001 From: William Cheng Date: Fri, 12 Apr 2019 11:51:17 +0800 Subject: [PATCH 2/7] update gradle version --- .../samples/local-spec/gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator-gradle-plugin/samples/local-spec/gradle.properties b/modules/openapi-generator-gradle-plugin/samples/local-spec/gradle.properties index d0b318ae11ab..c01d3c8f2773 100644 --- a/modules/openapi-generator-gradle-plugin/samples/local-spec/gradle.properties +++ b/modules/openapi-generator-gradle-plugin/samples/local-spec/gradle.properties @@ -1 +1 @@ -openApiGeneratorVersion=3.3.4 +openApiGeneratorVersion=4.0.0-beta3 From 70ee9208e4947964366de226d9f0124fdcb53a9a Mon Sep 17 00:00:00 2001 From: William Cheng Date: Fri, 12 Apr 2019 12:07:15 +0800 Subject: [PATCH 3/7] show gradle version --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index a60e2404f47e..5299bfbd1b94 100644 --- a/.travis.yml +++ b/.travis.yml @@ -121,6 +121,7 @@ script: # fail if generators contain tab '\t' - /bin/bash ./bin/utils/detect_tab_in_java_class.sh # test gradle plug-in + - gradle --version - gradle -b modules/openapi-generator-gradle-plugin/samples/local-spec/build.gradle buildGoSdk --info # run integration tests defined in maven pom.xml - ./run-in-docker.sh mvn --quiet --batch-mode clean install From 5995a6c703564f5e342ba425c389792d79e2fdfa Mon Sep 17 00:00:00 2001 From: William Cheng Date: Fri, 12 Apr 2019 12:14:46 +0800 Subject: [PATCH 4/7] test gradle plugin in circleci --- 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 9bcb34a73ad3..f51821ebde6f 100755 --- a/CI/circle_parallel.sh +++ b/CI/circle_parallel.sh @@ -8,8 +8,9 @@ NODE_INDEX=${CIRCLE_NODE_INDEX:-0} set -e if [ "$NODE_INDEX" = "1" ]; then + gradle --version + gradle -b modules/openapi-generator-gradle-plugin/samples/local-spec/build.gradle buildGoSdk --info echo "Running node $NODE_INDEX to test 'samples.circleci' defined in pom.xml ..." - #cp CI/pom.xml.circleci pom.xml java -version mvn --quiet verify -Psamples.circleci elif [ "$NODE_INDEX" = "2" ]; then @@ -20,7 +21,6 @@ elif [ "$NODE_INDEX" = "2" ]; then java -version ./bin/utils/ensure-up-to-date fi -#elif [ "$NODE_INDEX" = "3" ]; then echo "Running node $NODE_INDEX to test haskell" # install haskell curl -sSL https://get.haskellstack.org/ | sh @@ -42,7 +42,6 @@ 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 fi From 0f2b01f28c1bbca3503669a97a586acb81adfa34 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Fri, 12 Apr 2019 17:29:10 +0800 Subject: [PATCH 5/7] test appveyor in gradle --- appveyor.yml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 7d62a6b9b72c..ba7a8d39ff1b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,11 +14,24 @@ install: ) [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\maven-bin.zip", "C:\maven") } - - cmd: SET PATH=C:\maven\apache-maven-3.2.5\bin;%JAVA_HOME%\bin;%PATH% + # install gradle + - ps: | + Add-Type -AssemblyName System.IO.Compression.FileSystem + if (!(Test-Path -Path "C:\gradle" )) { + (new-object System.Net.WebClient).DownloadFile( + 'https://gradle.org/next-steps/?version=5.3.1&format=bin', + 'C:\gradle-bin.zip' + ) + [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\gradle-bin.zip", "C:\gradle") + } + + - cmd: SET PATH=C:\maven\apache-maven-3.2.5\bin;C:\gradle\gradle-5.3.1\bin;%JAVA_HOME%\bin;%PATH% - cmd: SET MAVEN_OPTS=-XX:MaxPermSize=2g -Xmx4g - cmd: SET JAVA_OPTS=-XX:MaxPermSize=2g -Xmx4g - cmd: SET M2_HOME=C:\maven\apache-maven-3.2.5 - cmd: java -version + - cmd: gradle -v + - cmd: gradle -b modules\openapi-generator-gradle-plugin\samples\local-spec\build.gradle buildGoSdk --info - cmd: dir/w - git clone https://github.com/wing328/swagger-samples - ps: Start-Process -FilePath 'C:\maven\apache-maven-3.2.5\bin\mvn' -ArgumentList 'jetty:run' -WorkingDirectory "$env:appveyor_build_folder\swagger-samples\java\java-jersey-jaxrs-ci" @@ -57,4 +70,5 @@ test_script: cache: - C:\maven\ + - C:\gradle\ - C:\Users\appveyor\.m2 From 16911c0b713efc83c63eaae93db0b34ba0269893 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Fri, 12 Apr 2019 17:38:09 +0800 Subject: [PATCH 6/7] use direct link --- appveyor.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index ba7a8d39ff1b..c18afcf4a082 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -19,12 +19,11 @@ install: Add-Type -AssemblyName System.IO.Compression.FileSystem if (!(Test-Path -Path "C:\gradle" )) { (new-object System.Net.WebClient).DownloadFile( - 'https://gradle.org/next-steps/?version=5.3.1&format=bin', + 'https://services.gradle.org/distributions/gradle-5.3.1-bin.zip', 'C:\gradle-bin.zip' ) [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\gradle-bin.zip", "C:\gradle") } - - cmd: SET PATH=C:\maven\apache-maven-3.2.5\bin;C:\gradle\gradle-5.3.1\bin;%JAVA_HOME%\bin;%PATH% - cmd: SET MAVEN_OPTS=-XX:MaxPermSize=2g -Xmx4g - cmd: SET JAVA_OPTS=-XX:MaxPermSize=2g -Xmx4g From cc1e7732037d3189cf01461a234ad380d2ec363b Mon Sep 17 00:00:00 2001 From: William Cheng Date: Fri, 12 Apr 2019 17:41:28 +0800 Subject: [PATCH 7/7] revert other ci config --- .travis.yml | 3 --- CI/circle_parallel.sh | 5 +++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5299bfbd1b94..4ea6e747895e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -120,9 +120,6 @@ script: - /bin/bash ./bin/utils/detect_merge_conflict.sh # fail if generators contain tab '\t' - /bin/bash ./bin/utils/detect_tab_in_java_class.sh - # test gradle plug-in - - gradle --version - - gradle -b modules/openapi-generator-gradle-plugin/samples/local-spec/build.gradle buildGoSdk --info # run integration tests defined in maven pom.xml - ./run-in-docker.sh mvn --quiet --batch-mode clean install - mvn --quiet --batch-mode verify -Psamples diff --git a/CI/circle_parallel.sh b/CI/circle_parallel.sh index f51821ebde6f..9bcb34a73ad3 100755 --- a/CI/circle_parallel.sh +++ b/CI/circle_parallel.sh @@ -8,9 +8,8 @@ NODE_INDEX=${CIRCLE_NODE_INDEX:-0} set -e if [ "$NODE_INDEX" = "1" ]; then - gradle --version - gradle -b modules/openapi-generator-gradle-plugin/samples/local-spec/build.gradle buildGoSdk --info echo "Running node $NODE_INDEX to test 'samples.circleci' defined in pom.xml ..." + #cp CI/pom.xml.circleci pom.xml java -version mvn --quiet verify -Psamples.circleci elif [ "$NODE_INDEX" = "2" ]; then @@ -21,6 +20,7 @@ elif [ "$NODE_INDEX" = "2" ]; then java -version ./bin/utils/ensure-up-to-date fi +#elif [ "$NODE_INDEX" = "3" ]; then echo "Running node $NODE_INDEX to test haskell" # install haskell curl -sSL https://get.haskellstack.org/ | sh @@ -42,6 +42,7 @@ 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 fi