Skip to content

Commit 4175ed8

Browse files
committed
merge master
2 parents ff5bd0b + 73dcdd6 commit 4175ed8

2,317 files changed

Lines changed: 68962 additions & 10228 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
name: Samples cpp httplib server
2+
3+
on:
4+
push:
5+
paths:
6+
- "samples/server/petstore/cpp-httplib-server/**"
7+
- ".github/workflows/samples-cpp-httplib-server.yaml"
8+
pull_request:
9+
paths:
10+
- "samples/server/petstore/cpp-httplib-server/**"
11+
- ".github/workflows/samples-cpp-httplib-server.yaml"
12+
13+
env:
14+
GRADLE_VERSION: 6.9
15+
16+
jobs:
17+
build:
18+
name: Build cpp httplib server
19+
strategy:
20+
matrix:
21+
sample:
22+
- samples/server/petstore/cpp-httplib-server/petstore
23+
- samples/server/petstore/cpp-httplib-server/feature-test
24+
os:
25+
- ubuntu-latest
26+
- macOS-latest
27+
- windows-latest
28+
runs-on: ${{ matrix.os }}
29+
steps:
30+
- uses: actions/checkout@v4
31+
32+
- name: Install dependencies (Linux)
33+
if: matrix.os == 'ubuntu-latest'
34+
run: |
35+
sudo apt-get update
36+
sudo apt-get install -y build-essential libssl-dev zlib1g-dev cmake
37+
38+
- name: Install dependencies (macOS)
39+
if: matrix.os == 'macOS-latest'
40+
run: |
41+
brew install openssl zlib cmake
42+
43+
- name: Install dependencies (Windows)
44+
if: matrix.os == 'windows-latest'
45+
run: |
46+
vcpkg install openssl:x64-windows zlib:x64-windows
47+
shell: cmd
48+
timeout-minutes: 20
49+
50+
- name: Build
51+
working-directory: ${{ matrix.sample }}
52+
run: |
53+
if [ "${{ matrix.os }}" = "windows-latest" ]; then
54+
cmake -S . -B build -DCMAKE_TOOLCHAIN_FILE="C:/vcpkg/scripts/buildsystems/vcpkg.cmake"
55+
else
56+
cmake -S . -B build
57+
fi
58+
cmake --build build --verbose
59+
shell: bash

.github/workflows/samples-groovy.yaml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,14 @@ jobs:
2020
matrix:
2121
sample:
2222
- samples/client/petstore/groovy
23+
services:
24+
petstore-api:
25+
image: swaggerapi/petstore
26+
ports:
27+
- 80:8080
28+
env:
29+
SWAGGER_HOST: http://petstore.swagger.io
30+
SWAGGER_BASE_PATH: /v2
2331
steps:
2432
- uses: actions/checkout@v5
2533
- uses: actions/setup-java@v5
@@ -41,6 +49,6 @@ jobs:
4149
gradle-version: ${{ env.GRADLE_VERSION }}
4250
build-root-directory: ${{ matrix.sample }}
4351
arguments: wrapper
44-
- name: Build
52+
- name: Build & Test
4553
working-directory: ${{ matrix.sample }}
46-
run: ./gradlew build -x test
54+
run: ./gradlew build

.github/workflows/samples-jdk17.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ on:
1414
- samples/client/petstore/java/microprofile-rest-client-outer-enum/**
1515
# servers
1616
- samples/openapi3/server/petstore/springboot-3/**
17+
- samples/server/petstore/springboot-x-implements-skip/**
1718
- samples/server/petstore/java-camel/**
1819
- samples/server/petstore/java-helidon-server/v3/mp/**
1920
- samples/server/petstore/java-helidon-server/v3/se/**
@@ -31,6 +32,7 @@ on:
3132
- samples/client/petstore/java/microprofile-rest-client-outer-enum/**
3233
# servers
3334
- samples/openapi3/server/petstore/springboot-3/**
35+
- samples/server/petstore/springboot-x-implements-skip/**
3436
- samples/server/petstore/java-camel/**
3537
- samples/server/petstore/java-helidon-server/v3/mp/**
3638
- samples/server/petstore/java-helidon-server/v3/se/**
@@ -54,6 +56,7 @@ jobs:
5456
- samples/client/petstore/java/microprofile-rest-client-outer-enum
5557
# servers
5658
- samples/openapi3/server/petstore/springboot-3
59+
- samples/server/petstore/springboot-x-implements-skip
5760
- samples/server/petstore/java-camel/
5861
- samples/server/petstore/java-helidon-server/v3/mp/
5962
- samples/server/petstore/java-helidon-server/v3/se

.github/workflows/samples-kotlin-echo-api.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ jobs:
2020
- samples/client/echo_api/kotlin-jvm-spring-3-restclient
2121
- samples/client/echo_api/kotlin-model-prefix-type-mappings
2222
- samples/client/echo_api/kotlin-jvm-okhttp
23+
- samples/client/echo_api/kotlin-jvm-okhttp-multipart-json
2324
steps:
2425
- uses: actions/checkout@v5
2526
- uses: actions/setup-java@v5

.github/workflows/samples-kotlin-server-jdk17.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: Samples Kotlin server (jdk17)
33
on:
44
push:
55
paths:
6+
- 'samples/server/others/kotlin-server/**'
67
- 'samples/server/petstore/kotlin-springboot-3*/**'
78
- 'samples/server/petstore/kotlin-server/**'
89
- 'samples/server/petstore/kotlin-server-modelMutable/**'
@@ -13,6 +14,7 @@ on:
1314
# - samples/server/petstore/kotlin-spring-default/**
1415
pull_request:
1516
paths:
17+
- 'samples/server/others/kotlin-server/**'
1618
- 'samples/server/petstore/kotlin-springboot-3*/**'
1719
- 'samples/server/petstore/kotlin-server/**'
1820
- 'samples/server/petstore/kotlin-server-modelMutable/**'
@@ -34,6 +36,10 @@ jobs:
3436
matrix:
3537
sample:
3638
# server
39+
- samples/server/others/kotlin-server/polymorphism-allof-and-discriminator
40+
- samples/server/others/kotlin-server/polymorphism-and-discriminator-disabled-jackson-fix
41+
- samples/server/others/kotlin-server/polymorphism-and-discriminator
42+
- samples/server/others/kotlin-server/polymorphism
3743
- samples/server/petstore/kotlin-server-required-and-nullable-properties
3844
- samples/server/petstore/kotlin-springboot-3
3945
- samples/server/petstore/kotlin-springboot-3-no-response-entity

.github/workflows/samples-kotlin-server-jdk21.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@ name: Samples Kotlin server (jdk21)
33
on:
44
push:
55
paths:
6+
- 'samples/server/others/kotlin-server/**'
67
- 'samples/server/petstore/kotlin-server/**'
78
- 'samples/server/petstore/kotlin-server-required-and-nullable-properties/**'
89
pull_request:
910
paths:
11+
- 'samples/server/others/kotlin-server/**'
1012
- 'samples/server/petstore/kotlin-server/**'
1113
- 'samples/server/petstore/kotlin-server-required-and-nullable-properties/**'
1214

@@ -21,6 +23,10 @@ jobs:
2123
fail-fast: false
2224
matrix:
2325
sample:
26+
- samples/server/others/kotlin-server/polymorphism-allof-and-discriminator
27+
- samples/server/others/kotlin-server/polymorphism-and-discriminator-disabled-jackson-fix
28+
- samples/server/others/kotlin-server/polymorphism-and-discriminator
29+
- samples/server/others/kotlin-server/polymorphism
2430
- samples/server/petstore/kotlin-server/javalin-6
2531
- samples/server/petstore/kotlin-server/ktor
2632
- samples/server/petstore/kotlin-server/ktor2

.github/workflows/samples-python-fastapi-server.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- uses: actions/checkout@v5
2222
- uses: actions/setup-python@v6
2323
with:
24-
python-version: '3.9'
24+
python-version: '3.10'
2525
- name: Install dependencies
2626
working-directory: ${{ matrix.sample }}
2727
run: |

.github/workflows/samples-rust-server.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,15 @@ jobs:
6464
if cargo read-manifest | grep -q '"validate"'; then
6565
cargo build --features validate --all-targets
6666
fi
67+
# Test TLS features if they exist
68+
if cargo read-manifest | grep -q '"client-tls"'; then
69+
# Client without TLS (HTTP-only)
70+
cargo build --no-default-features --features=client --lib
71+
# Client with TLS (using native-tls)
72+
cargo build --no-default-features --features=client,client-tls --lib
73+
# Server without TLS
74+
cargo build --no-default-features --features=server --lib
75+
fi
6776
cargo fmt
6877
cargo test
6978
cargo clippy

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,9 @@ samples/client/petstore/kotlin*/src/main/kotlin/test/
229229
samples/client/petstore/kotlin*/build/
230230
samples/server/others/kotlin-server/jaxrs-spec/build/
231231
samples/client/echo_api/kotlin-jvm-spring-3-restclient/build/
232+
samples/client/echo_api/kotlin-jvm-spring-3-webclient/build/
232233
samples/client/echo_api/kotlin-jvm-okhttp/build/
234+
samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/build/
233235

234236
# haskell
235237
.stack-work

0 commit comments

Comments
 (0)