From fb25d70c15024bcb6d7ed1c63df92a12bdab5875 Mon Sep 17 00:00:00 2001 From: Matheus Cruz Date: Thu, 21 Dec 2023 18:10:42 -0300 Subject: [PATCH 1/7] ci: try to fix upload-artifact@v4 issue --- .github/workflows/build.yml | 6 +++--- .github/workflows/preview.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9cd88acf..f4c480c2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ jobs: name: Build - RESTEasy Classic runs-on: ${{ matrix.os }} strategy: - matrix: + matrix: os: [ubuntu-latest, windows-latest] java: [ { 'version': '11' }, @@ -57,7 +57,7 @@ jobs: if: github.event_name == 'pull_request' uses: actions/upload-artifact@v4 with: - name: site + name: site-{{ matrix.java.version }}-{{ matrix.os }} path: ./docs/target/generated-docs retention-days: 3 @@ -96,6 +96,6 @@ jobs: if: github.event_name == 'pull_request' uses: actions/upload-artifact@v4 with: - name: site + name: site-{{ matrix.java.version }}-{{ matrix.os }} path: ./docs/target/generated-docs retention-days: 3 diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index aa0d3853..b064e76a 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -16,7 +16,7 @@ jobs: with: workflow: ${{ github.event.workflow_run.workflow_id }} workflow_conclusion: success - name: site + name: site-17-ubuntu-latest - name: Store PR id as variable id: pr run: | From 72fdadd4d310a70809845e3fa4562600cba2b083 Mon Sep 17 00:00:00 2001 From: Matheus Cruz Date: Thu, 21 Dec 2023 18:19:09 -0300 Subject: [PATCH 2/7] ci: add reactive suffix for reactive build --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f4c480c2..66979117 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -96,6 +96,6 @@ jobs: if: github.event_name == 'pull_request' uses: actions/upload-artifact@v4 with: - name: site-{{ matrix.java.version }}-{{ matrix.os }} + name: site-{{ matrix.java.version }}-{{ matrix.os }}-reactive path: ./docs/target/generated-docs retention-days: 3 From ddf3ed354bbbc6a1b14598321788251856b37c8f Mon Sep 17 00:00:00 2001 From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com> Date: Thu, 21 Dec 2023 18:34:18 -0300 Subject: [PATCH 3/7] Add the dolar sign to vars --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 66979117..b23ac709 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -57,7 +57,7 @@ jobs: if: github.event_name == 'pull_request' uses: actions/upload-artifact@v4 with: - name: site-{{ matrix.java.version }}-{{ matrix.os }} + name: site-${{ matrix.java.version }}-${{ matrix.os }} path: ./docs/target/generated-docs retention-days: 3 @@ -96,6 +96,6 @@ jobs: if: github.event_name == 'pull_request' uses: actions/upload-artifact@v4 with: - name: site-{{ matrix.java.version }}-{{ matrix.os }}-reactive + name: site-${{ matrix.java.version }}-${{ matrix.os }}-reactive path: ./docs/target/generated-docs retention-days: 3 From 09ae4d1c722038d314fcec4144f7d35f7f83e4f4 Mon Sep 17 00:00:00 2001 From: Matheus Cruz Date: Thu, 21 Dec 2023 19:08:35 -0300 Subject: [PATCH 4/7] ci: add build-website workflow --- .github/workflows/build.yml | 26 --------------- .github/workflows/build_website.yml | 50 +++++++++++++++++++++++++++++ .github/workflows/preview.yml | 4 +-- 3 files changed, 52 insertions(+), 28 deletions(-) create mode 100644 .github/workflows/build_website.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b23ac709..bc5f9bfd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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-${{ matrix.java.version }}-${{ matrix.os }} - path: ./docs/target/generated-docs - retention-days: 3 - build_reactive: name: Build - RESTEasy Reactive runs-on: ${{ matrix.os }} @@ -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-${{ matrix.java.version }}-${{ matrix.os }}-reactive - path: ./docs/target/generated-docs - retention-days: 3 diff --git a/.github/workflows/build_website.yml b/.github/workflows/build_website.yml new file mode 100644 index 00000000..d116fc3d --- /dev/null +++ b/.github/workflows/build_website.yml @@ -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 + + - 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 \ No newline at end of file diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index b064e76a..e7bef0b9 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -2,7 +2,7 @@ name: Surge.sh Preview on: workflow_run: - workflows: ["Build"] + workflows: ["Build Website"] types: - completed @@ -16,7 +16,7 @@ jobs: with: workflow: ${{ github.event.workflow_run.workflow_id }} workflow_conclusion: success - name: site-17-ubuntu-latest + name: site - name: Store PR id as variable id: pr run: | From bcbd5355c7b77cdf6a11e88af54200a7473a9887 Mon Sep 17 00:00:00 2001 From: Matheus Cruz Date: Thu, 21 Dec 2023 19:10:15 -0300 Subject: [PATCH 5/7] ci: add -DskipTests option --- .github/workflows/build_website.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_website.yml b/.github/workflows/build_website.yml index d116fc3d..bd5a8822 100644 --- a/.github/workflows/build_website.yml +++ b/.github/workflows/build_website.yml @@ -34,7 +34,7 @@ jobs: cache: 'maven' - name: Build with Maven - run: mvn '-Dorg.slf4j.simpleLogger.log.org.openapitools=off' -B formatter:validate impsort:check verify --file pom.xml + 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' From b21f43aee3d7c9708645a019381c1869f050fdd8 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Fri, 22 Dec 2023 08:47:42 -0300 Subject: [PATCH 6/7] docs: add mcruzdev as a contributor for code, and doc (#602) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] --------- Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 4 +++- README.md | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index f0d29473..e0cfc6b4 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -176,7 +176,9 @@ "avatar_url": "https://avatars.githubusercontent.com/u/56329339?v=4", "profile": "https://github.com/mcruzdev", "contributions": [ - "infra" + "infra", + "code", + "doc" ] }, { diff --git a/README.md b/README.md index c00c60a7..60659ecc 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d Adriano Augusto Tagliaferro
Adriano Augusto Tagliaferro
⚠️ Christian Berger
Christian Berger
💻 Bruno Alves
Bruno Alves
💻 - Matheus Cruz
Matheus Cruz
🚇 + Matheus Cruz
Matheus Cruz
🚇 💻 📖 Laurent Perez
Laurent Perez
💻 Bas Passon
Bas Passon
💻 From 7650dd88eb63900ec2ebb6402012060d610f8e4f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Dec 2023 09:09:24 -0300 Subject: [PATCH 7/7] Bump quarkus.version from 3.6.3 to 3.6.4 (#597) Bumps `quarkus.version` from 3.6.3 to 3.6.4. Updates `io.quarkus:quarkus-bom` from 3.6.3 to 3.6.4 - [Release notes](https://github.com/quarkusio/quarkus/releases) - [Commits](https://github.com/quarkusio/quarkus/compare/3.6.3...3.6.4) Updates `io.quarkus:quarkus-maven-plugin` from 3.6.3 to 3.6.4 Updates `io.quarkus:quarkus-extension-processor` from 3.6.3 to 3.6.4 Updates `io.quarkus:quarkus-extension-maven-plugin` from 3.6.3 to 3.6.4 - [Release notes](https://github.com/quarkusio/quarkus/releases) - [Commits](https://github.com/quarkusio/quarkus/compare/3.6.3...3.6.4) --- updated-dependencies: - dependency-name: io.quarkus:quarkus-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-extension-processor dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-extension-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ec9c0e12..75ff449a 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 11 UTF-8 UTF-8 - 3.6.3 + 3.6.4 3.25.7 3.24.2 4.0.2