-
-
Notifications
You must be signed in to change notification settings - Fork 6.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into addl-props-import
* master: (720 commits) [docs] Update README badges (#7276) Update apiInvoker.mustache and sample file for akka-scala client for issue #7258 fix (#7259) [Dart] Get all enum values in a list (#7166) Update .gitattributes [ci] Set ubuntu workflow verification to autoclrf=true, safeclrf=false Update check-supported-versions.yaml [ci] Update gitattributes and allow skipping docs generation for Windows CI workflows (#7273) [core][bug] FILES is now path relative with no prefixes (#7271) Update check-supported-versions.yaml Update check-supported-versions.yaml (#7268) [Java][jersey2] Add jersey injection dependencies (#7240) [C][Clang Static Analyzer] Remove the useless variable when assembling URL (#7255) Date format dart (#6389) minor enhancement to java client generator (#7253) typescript: Fix Union Types Import Issue (#6789) Modifying the es5 and es6 templates for javascript to handle default values (#6649) [python-exp] simplify examples (#7157) Support for KumuluzEE microprofile runtime (#5944) [C#][netcore] minor improvements and bug fixes (#7244) Deprecate Flash (ActionScript) client generator (#7231) ...
- Loading branch information
Showing
18,055 changed files
with
451,810 additions
and
715,741 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| name: Check Supported Java Versions | ||
| on: | ||
| push: | ||
| branches: | ||
| - master | ||
|
|
||
| jobs: | ||
| build: | ||
| name: Build on JDK ${{ matrix.java }} and ${{ matrix.os }} | ||
| runs-on: ${{ matrix.os }} | ||
| strategy: | ||
| matrix: | ||
| java: [8, 11] | ||
| os: [ubuntu-latest] | ||
| include: | ||
| - java: 8 | ||
| os: windows-latest | ||
| - java: 13 | ||
| os: ubuntu-latest | ||
| # Need to update to Gradle version with v13 support in modules/openapi-generator-gradle-plugin/pom.xml | ||
| flags: -am -pl modules/openapi-generator-cli | ||
| steps: | ||
| - name: Check out code | ||
| uses: actions/checkout@v2 | ||
|
|
||
| - name: Set up JDK ${{ matrix.java }} | ||
| uses: actions/setup-java@v1 | ||
| with: | ||
| java-version: ${{ matrix.java }} | ||
|
|
||
| - uses: actions/cache@v1 | ||
| with: | ||
| path: ~/.m2/repository | ||
| key: ${{ runner.os }}-maven-${{ hashFiles('pom.xml', 'modules/**/pom.xml') }} | ||
| restore-keys: | | ||
| ${{ runner.os }}-maven- | ||
| - uses: actions/cache@v2 | ||
| with: | ||
| path: | | ||
| ~/.gradle/caches | ||
| ~/.gradle/wrapper | ||
| key: ${{ runner.os }}-gradle-${{ hashFiles('modules/openapi-generator-gradle-plugin/pom.xml') }} | ||
| restore-keys: | | ||
| ${{ runner.os }}-gradle- | ||
| - name: Build with Maven | ||
| shell: bash | ||
| run: mvn -nsu -B --quiet -Djacoco.skip=true -Dorg.slf4j.simpleLogger.defaultLogLevel=error --no-transfer-progress clean install --file pom.xml ${{ matrix.flags }} | ||
|
|
||
| - name: Test gradle | ||
| shell: bash | ||
| run: gradle -b modules/openapi-generator-gradle-plugin/samples/local-spec/build.gradle buildGoSdk --stacktrace | ||
|
|
||
| - name: Upload Maven build artifact | ||
| uses: actions/upload-artifact@v1 | ||
| if: matrix.java == '8' && matrix.os == 'ubuntu-latest' | ||
| with: | ||
| name: artifact | ||
| path: modules/openapi-generator-cli/target/openapi-generator-cli.jar | ||
|
|
||
| verify: | ||
| name: Verifies integrity of the commit on ${{ matrix.os }} | ||
| needs: build | ||
| runs-on: ${{ matrix.os }} | ||
| strategy: | ||
| matrix: | ||
| os: [ubuntu-latest] | ||
| # include: | ||
| # - os: windows-latest | ||
| # flags: --skip-docs | ||
| steps: | ||
| - name: Check out code | ||
| uses: actions/checkout@v2 | ||
| - name: Download build artifact | ||
| uses: actions/download-artifact@v1 | ||
| with: | ||
| name: artifact | ||
| - name: Run Ensures Script | ||
| shell: bash | ||
| run: | | ||
| git config --global core.fileMode false | ||
| git config --global core.safecrlf false | ||
| git config --global core.autocrlf true | ||
| mkdir -p modules/openapi-generator-cli/target/ | ||
| mv artifact/openapi-generator-cli.jar modules/openapi-generator-cli/target/ | ||
| ./bin/utils/ensure-up-to-date ${{ matrix.flags }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| name: Docker Tag latest-release | ||
|
|
||
| # Run every couple of days | ||
| on: | ||
| schedule: | ||
| - cron: "30 12 */2 * *" | ||
|
|
||
| jobs: | ||
| # This pulls all containers for the last known release tag, and tags as latest-release or x-latest-release for shared repo | ||
| tagLatestRelease: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
|
|
||
| # Pull the code so we have git metadata | ||
| - name: Checkout code | ||
| uses: actions/checkout@v2 | ||
|
|
||
| # This action will "unshallow" so we have all tag info | ||
| - name: Get latest tag | ||
| id: tagger | ||
| uses: jimschubert/query-tag-action@v1 | ||
| with: | ||
| include: 'v*' | ||
| exclude: '*-rc*' | ||
| commit-ish: 'HEAD~' | ||
|
|
||
| - name: DockerHub Login | ||
| run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin | ||
|
|
||
| # Tags openapitools/openapi-generator-cli | ||
| - name: "Tag openapi-generator-cli:x" | ||
| id: tag-openapi-generator-cli | ||
| if: always() | ||
| run: | | ||
| echo 'Tagging as latest-release: ${{steps.tagger.outputs.tag}}' | ||
| docker pull openapitools/openapi-generator-cli:${{steps.tagger.outputs.tag}} | ||
| docker tag openapitools/openapi-generator-cli:${{steps.tagger.outputs.tag}} openapitools/openapi-generator-cli:latest-release | ||
| docker push openapitools/openapi-generator-cli:latest-release | ||
| # Tags openapitools/openapi-generator-online | ||
| - name: "Tag openapi-generator-online:x" | ||
| id: tag-openapi-generator-online | ||
| if: always() | ||
| run: | | ||
| echo 'Tagging as latest-release: ${{steps.tagger.outputs.tag}}' | ||
| docker pull openapitools/openapi-generator-online:${{steps.tagger.outputs.tag}} | ||
| docker tag openapitools/openapi-generator-online:${{steps.tagger.outputs.tag}} openapitools/openapi-generator-online:latest-release | ||
| docker push openapitools/openapi-generator-online:latest-release | ||
| # Tags openapitools/openapi-generator's CLI image (this repo holds CLI + Online via tag prefix) | ||
| - name: "Tag openapi-generator:cli-x" | ||
| id: tag-cli | ||
| if: always() | ||
| run: | | ||
| echo 'Tagging as latest-release: ${{steps.tagger.outputs.tag}}' | ||
| docker pull openapitools/openapi-generator:cli-${{steps.tagger.outputs.tag}} | ||
| docker tag openapitools/openapi-generator:cli-${{steps.tagger.outputs.tag}} openapitools/openapi-generator:cli-latest-release | ||
| docker push openapitools/openapi-generator:cli-latest-release | ||
| # Tags openapitools/openapi-generator's ONLINE image (this repo holds CLI + Online via tag prefix) | ||
| - name: "Tag openapi-generator:online-x" | ||
| id: tag-online | ||
| if: always() | ||
| run: | | ||
| echo 'Tagging as latest-release: ${{steps.tagger.outputs.tag}}' | ||
| docker pull openapitools/openapi-generator:online-${{steps.tagger.outputs.tag}} | ||
| docker tag openapitools/openapi-generator:online-${{steps.tagger.outputs.tag}} openapitools/openapi-generator:online-latest-release | ||
| docker push openapitools/openapi-generator:online-latest-release | ||
| # Clean up docker credentials/configs/etc. | ||
| - name: Cleanup | ||
| if: always() | ||
| run: | | ||
| rm -f ${HOME}/.docker/config.json |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,6 +21,10 @@ 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 | ||
|
|
@@ -41,6 +45,7 @@ cache: | |
| - $HOME/.npm | ||
| - $HOME/.rvm/gems/ruby-2.4.1 | ||
| - $HOME/website/node_modules/ | ||
| - $HOME/.cache/deno | ||
|
|
||
| services: | ||
| - docker | ||
|
|
@@ -65,19 +70,20 @@ before_install: | |
| - gem install bundler | ||
| - npm install -g typescript | ||
| - npm install -g npm | ||
| #- npm install -g [email protected] | ||
| - npm config set registry http://registry.npmjs.org/ | ||
| # set python 3.6.3 as default | ||
| - source ~/virtualenv/python3.6/bin/activate | ||
| # to run petstore server locally via docker | ||
| - docker pull swaggerapi/petstore | ||
| - docker run -d -e SWAGGER_HOST=http://petstore.swagger.io -e SWAGGER_BASE_PATH=/v2 -p 80:8080 swaggerapi/petstore | ||
| - docker ps -a | ||
| # -- skip bash test to shorten build time | ||
| # Add bats test framework and cURL for Bash script integration tests | ||
| - sudo add-apt-repository ppa:duggan/bats --yes | ||
| - sudo apt-get update -qq | ||
| - sudo apt-get install -qq bats | ||
| - sudo apt-get install -qq curl | ||
| #- sudo add-apt-repository ppa:duggan/bats --yes | ||
| #- sudo apt-get update -qq | ||
| #- sudo apt-get install -qq bats | ||
| #- sudo apt-get install -qq curl | ||
| # -- skip bash test end | ||
| # install dart | ||
| #- sudo apt-get update | ||
| #- sudo apt-get install apt-transport-https | ||
|
|
@@ -86,11 +92,9 @@ before_install: | |
| #- sudo apt-get update | ||
| #- sudo apt-get install dart | ||
| # switch to php7 | ||
| - phpenv global 7.1 | ||
| - phpenv versions | ||
| - phpenv global 7.2.15 | ||
| - php -v | ||
| # install perl module | ||
| #- cpanm --local-lib=~/perl5 local::lib && eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib) | ||
| #- cpanm Test::Exception Test::More Log::Any LWP::UserAgent JSON URI:Query Module::Runtime DateTime Module::Find Moose::Role | ||
| # comment out below as installation failed in travis | ||
| # Add rebar3 build tool and recent Erlang/OTP for Erlang petstore server tests. | ||
| # - Travis CI does not support rebar3 [yet](https://github.com/travis-ci/travis-ci/issues/6506#issuecomment-275189490). | ||
|
|
@@ -102,6 +106,11 @@ before_install: | |
| # install Qt5 | ||
| - sudo apt install -y --no-install-recommends qt5-default | ||
| - cmake --version | ||
| # -- skip perl test to shorten build time | ||
| # perl dep | ||
| #- cpanm --local-lib=~/perl5 local::lib && eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib) | ||
| #- cpanm --quiet --no-interactive Test::Exception Test::More Log::Any LWP::UserAgent URI::Query Module::Runtime DateTime Module::Find Moose::Role JSON || echo "Igorned failure from cpanm" | ||
| # -- skip perl test end | ||
| # show host table to confirm petstore.swagger.io is mapped to localhost | ||
| - cat /etc/hosts | ||
| # show java version | ||
|
|
@@ -112,6 +121,9 @@ before_install: | |
| gpg --check-trustdb ; | ||
| fi; | ||
| - pushd .; cd website; yarn install; popd | ||
| # install Deno | ||
| - curl -fsSL https://deno.land/x/install/install.sh | sh -s v1.1.2 | ||
| - export PATH="$HOME/.deno/bin:$PATH" | ||
|
|
||
| install: | ||
| # Add Godeps dependencies to GOPATH and PATH | ||
|
|
@@ -136,16 +148,8 @@ script: | |
| - /bin/bash ./bin/utils/detect_tab_in_java_class.sh | ||
| # run integration tests defined in maven pom.xml | ||
| # WARN: Travis will timeout after 10 minutes of no stdout/stderr activity, which is problematic with mvn --quiet. | ||
| - mvn --quiet --batch-mode --show-version clean install -Dorg.slf4j.simpleLogger.defaultLogLevel=error | ||
| - mvn --quiet --batch-mode --show-version verify -Psamples -Dorg.slf4j.simpleLogger.defaultLogLevel=error | ||
| # test maven plugin | ||
| - mvn --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/java-client.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error | ||
| - mvn --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/multi-module/pom.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error | ||
| - mvn --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/kotlin.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error | ||
| - mvn --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/spring.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error | ||
| # test gradle plugin | ||
| - (cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew buildGoSdk) | ||
| - (cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew openApiGenerate) | ||
| - mvn --no-snapshot-updates --quiet --batch-mode --show-version clean install -Dorg.slf4j.simpleLogger.defaultLogLevel=error | ||
| - mvn --no-snapshot-updates --quiet --batch-mode --show-version verify -Psamples -Dorg.slf4j.simpleLogger.defaultLogLevel=error | ||
| after_success: | ||
| # push to maven repo | ||
| - if [ $SONATYPE_USERNAME ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.