Skip to content

Commit

Permalink
Merge branch 'quarkiverse:main' into issue-542
Browse files Browse the repository at this point in the history
  • Loading branch information
mcruzdev authored Dec 22, 2023
2 parents 3c93e78 + 7650dd8 commit 22b2a31
Show file tree
Hide file tree
Showing 6 changed files with 57 additions and 31 deletions.
4 changes: 3 additions & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,9 @@
"avatar_url": "https://avatars.githubusercontent.com/u/56329339?v=4",
"profile": "https://github.com/mcruzdev",
"contributions": [
"infra"
"infra",
"code",
"doc"
]
},
{
Expand Down
28 changes: 1 addition & 27 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
name: Build - RESTEasy Classic
runs-on: ${{ matrix.os }}
strategy:
matrix:
matrix:
os: [ubuntu-latest, windows-latest]
java: [
{ 'version': '11' },
Expand All @@ -48,19 +48,6 @@ jobs:
- name: Build with Maven
run: mvn '-Dorg.slf4j.simpleLogger.log.org.openapitools=off' -B formatter:validate impsort:check verify --file pom.xml

- name: Store PR id
if: github.event_name == 'pull_request'
run: |
echo ${{ github.event.number }} > ./docs/target/generated-docs/pr-id.txt
- name: Publishing directory for PR preview
if: github.event_name == 'pull_request'
uses: actions/upload-artifact@v4
with:
name: site
path: ./docs/target/generated-docs
retention-days: 3

build_reactive:
name: Build - RESTEasy Reactive
runs-on: ${{ matrix.os }}
Expand All @@ -86,16 +73,3 @@ jobs:

- name: Build with Maven
run: mvn -Presteasy-reactive '-Dorg.slf4j.simpleLogger.log.org.openapitools=off' -B formatter:validate impsort:check verify --file pom.xml

- name: Store PR id
if: github.event_name == 'pull_request'
run: |
echo ${{ github.event.number }} > ./docs/target/generated-docs/pr-id.txt
- name: Publishing directory for PR preview
if: github.event_name == 'pull_request'
uses: actions/upload-artifact@v4
with:
name: site
path: ./docs/target/generated-docs
retention-days: 3
50 changes: 50 additions & 0 deletions .github/workflows/build_website.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Build Website

on:
push:
branches:
- "main"
paths-ignore:
- '.gitignore'
- 'CODEOWNERS'
- 'LICENSE'
- '*.md'
- '*.adoc'
- '*.txt'
- '.all-contributorsrc'
pull_request:
paths-ignore:
- '.gitignore'
- 'CODEOWNERS'
- 'LICENSE'
- '*.md'
- '*.txt'
- '.all-contributorsrc'
jobs:
build-website:
name: Build Website
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 17
cache: 'maven'

- name: Build with Maven
run: mvn '-Dorg.slf4j.simpleLogger.log.org.openapitools=off' -B formatter:validate impsort:check verify --file pom.xml -DskipTests

- name: Store PR id
if: github.event_name == 'pull_request'
run: |
echo ${{ github.event.number }} > ./docs/target/generated-docs/pr-id.txt
- name: Publishing directory for PR preview
if: github.event_name == 'pull_request'
uses: actions/upload-artifact@v4
with:
name: site
path: ./docs/target/generated-docs
retention-days: 3
2 changes: 1 addition & 1 deletion .github/workflows/preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Surge.sh Preview

on:
workflow_run:
workflows: ["Build"]
workflows: ["Build Website"]
types:
- completed

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<td align="center" valign="top" width="14.28%"><a href="https://www.linkedin.com/in/adrianotagliaferro/"><img src="https://avatars.githubusercontent.com/u/1286247?v=4?s=100" width="100px;" alt="Adriano Augusto Tagliaferro"/><br /><sub><b>Adriano Augusto Tagliaferro</b></sub></a><br /><a href="https://github.com/quarkiverse/quarkus-openapi-generator/commits?author=dritoferro" title="Tests">⚠️</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://techspace.de"><img src="https://avatars.githubusercontent.com/u/3606282?v=4?s=100" width="100px;" alt="Christian Berger"/><br /><sub><b>Christian Berger</b></sub></a><br /><a href="https://github.com/quarkiverse/quarkus-openapi-generator/commits?author=chberger" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/brunobaiano"><img src="https://avatars.githubusercontent.com/u/13356327?v=4?s=100" width="100px;" alt="Bruno Alves"/><br /><sub><b>Bruno Alves</b></sub></a><br /><a href="https://github.com/quarkiverse/quarkus-openapi-generator/commits?author=brunobaiano" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/mcruzdev"><img src="https://avatars.githubusercontent.com/u/56329339?v=4?s=100" width="100px;" alt="Matheus Cruz"/><br /><sub><b>Matheus Cruz</b></sub></a><br /><a href="#infra-mcruzdev" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/mcruzdev"><img src="https://avatars.githubusercontent.com/u/56329339?v=4?s=100" width="100px;" alt="Matheus Cruz"/><br /><sub><b>Matheus Cruz</b></sub></a><br /><a href="#infra-mcruzdev" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="https://github.com/quarkiverse/quarkus-openapi-generator/commits?author=mcruzdev" title="Code">💻</a> <a href="https://github.com/quarkiverse/quarkus-openapi-generator/commits?author=mcruzdev" title="Documentation">📖</a></td>
<td align="center" valign="top" width="14.28%"><a href="http://laurentperez.fr"><img src="https://avatars.githubusercontent.com/u/1085201?v=4?s=100" width="100px;" alt="Laurent Perez"/><br /><sub><b>Laurent Perez</b></sub></a><br /><a href="https://github.com/quarkiverse/quarkus-openapi-generator/commits?author=laurentperez" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/bpasson"><img src="https://avatars.githubusercontent.com/u/6814512?v=4?s=100" width="100px;" alt="Bas Passon"/><br /><sub><b>Bas Passon</b></sub></a><br /><a href="https://github.com/quarkiverse/quarkus-openapi-generator/commits?author=bpasson" title="Code">💻</a></td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<maven.compiler.release>11</maven.compiler.release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<quarkus.version>3.6.3</quarkus.version>
<quarkus.version>3.6.4</quarkus.version>
<version.com.github.javaparser>3.25.7</version.com.github.javaparser>
<version.org.assertj>3.24.2</version.org.assertj>
<version.org.eclipse.microprofile.fault-tolerance>4.0.2</version.org.eclipse.microprofile.fault-tolerance>
Expand Down

0 comments on commit 22b2a31

Please sign in to comment.