From 60a77294c3b8ac7830031847859daff46883bc08 Mon Sep 17 00:00:00 2001 From: Gonzalo Busto Musi Date: Fri, 27 Dec 2024 15:00:24 +0100 Subject: [PATCH 01/13] feat(gh-action): Added workflows and configuration Added workflows to use the centralized workflows in app-summoner-sync and configuration for the actions. --- .github/workflows/on-all-pr-workflows.yml | 13 ++++++ .github/workflows/on-main-pr-workflows.yml | 14 ++++++ .github/workflows/on-release.yml | 14 ++++++ checkstyle.xml | 35 +++++++++++++++ pmd.xml | 22 +++++++++ pom.xml | 52 ++++++++++++++++++++++ 6 files changed, 150 insertions(+) create mode 100644 .github/workflows/on-all-pr-workflows.yml create mode 100644 .github/workflows/on-main-pr-workflows.yml create mode 100644 .github/workflows/on-release.yml create mode 100644 checkstyle.xml create mode 100644 pmd.xml diff --git a/.github/workflows/on-all-pr-workflows.yml b/.github/workflows/on-all-pr-workflows.yml new file mode 100644 index 0000000..6382415 --- /dev/null +++ b/.github/workflows/on-all-pr-workflows.yml @@ -0,0 +1,13 @@ +name: On all Pull Requests + +on: + pull_request: + types: [opened, synchronize, reopened] + +jobs: + call-changelog-workflow: + runs-on: ubuntu-latest + + steps: + - name: Call PR Changelog Preview workflow from App Summoner Sync + uses: ${{ github.repository_owner }}/app-summoner-sync/.github/workflows/pr-changelog-preview.yml@feature/new-github-actions diff --git a/.github/workflows/on-main-pr-workflows.yml b/.github/workflows/on-main-pr-workflows.yml new file mode 100644 index 0000000..ec27f20 --- /dev/null +++ b/.github/workflows/on-main-pr-workflows.yml @@ -0,0 +1,14 @@ +name: On PR to Main + +on: + pull_request: + branches: + - main + +jobs: + call-java-code-quality-workflow: + runs-on: ubuntu-latest + + steps: + - name: Call Detect Main Language and Trigger Java Maven Code Quality Workflow + uses: ${{ github.repository_owner }}/app-summoner-sync/.github/workflows/trigger-java-code-quality.yml@feature/new-github-actions diff --git a/.github/workflows/on-release.yml b/.github/workflows/on-release.yml new file mode 100644 index 0000000..d8ddcaa --- /dev/null +++ b/.github/workflows/on-release.yml @@ -0,0 +1,14 @@ +name: Release workflow + +on: + push: + branches: + - main + +jobs: + call-release-workflow: + runs-on: ubuntu-latest + + steps: + - name: Call Release workflow from App Summoner Sync + uses: ${{ github.repository_owner }}/app-summoner-sync/.github/workflows/release-workflow.yml@feature/new-github-actions diff --git a/checkstyle.xml b/checkstyle.xml new file mode 100644 index 0000000..a8155b9 --- /dev/null +++ b/checkstyle.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pmd.xml b/pmd.xml new file mode 100644 index 0000000..1d9a0c4 --- /dev/null +++ b/pmd.xml @@ -0,0 +1,22 @@ + + + + Custom ruleset for static code analysis using PMD. + + + + + + + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml index f676728..5d1bdf0 100644 --- a/pom.xml +++ b/pom.xml @@ -116,6 +116,7 @@ + @@ -142,6 +143,57 @@ + + + io.spring.javaformat + spring-javaformat-maven-plugin + 0.0.36 + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.2.2 + + checkstyle.xml + + + + + com.github.spotbugs + spotbugs-maven-plugin + 4.7.3.1 + + + org.apache.maven.plugins + maven-pmd-plugin + 3.18.0 + + + org.owasp + dependency-check-maven + 8.4.0 + + + org.jacoco + jacoco-maven-plugin + 0.8.10 + + + + BUNDLE + + + LINE + COVEREDRATIO + 0.10 + + + + + + + From a9bea3b1f7c5dab5b2874e3c75d211010ce329c7 Mon Sep 17 00:00:00 2001 From: Gonzalo Busto Musi Date: Fri, 27 Dec 2024 15:06:20 +0100 Subject: [PATCH 02/13] fix(gh-action): Fixed reusable workflow usage Changed the structure of the workflows to fix the error "reusable workflows should be referenced at the top-level `jobs.*.uses' key, not within steps" --- .github/workflows/on-all-pr-workflows.yml | 6 +----- .github/workflows/on-main-pr-workflows.yml | 6 +----- .github/workflows/on-release.yml | 6 +----- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/.github/workflows/on-all-pr-workflows.yml b/.github/workflows/on-all-pr-workflows.yml index 6382415..5dee914 100644 --- a/.github/workflows/on-all-pr-workflows.yml +++ b/.github/workflows/on-all-pr-workflows.yml @@ -6,8 +6,4 @@ on: jobs: call-changelog-workflow: - runs-on: ubuntu-latest - - steps: - - name: Call PR Changelog Preview workflow from App Summoner Sync - uses: ${{ github.repository_owner }}/app-summoner-sync/.github/workflows/pr-changelog-preview.yml@feature/new-github-actions + uses: ${{ github.repository_owner }}/app-summoner-sync/.github/workflows/pr-changelog-preview.yml@feature/new-github-actions diff --git a/.github/workflows/on-main-pr-workflows.yml b/.github/workflows/on-main-pr-workflows.yml index ec27f20..14aabb2 100644 --- a/.github/workflows/on-main-pr-workflows.yml +++ b/.github/workflows/on-main-pr-workflows.yml @@ -7,8 +7,4 @@ on: jobs: call-java-code-quality-workflow: - runs-on: ubuntu-latest - - steps: - - name: Call Detect Main Language and Trigger Java Maven Code Quality Workflow - uses: ${{ github.repository_owner }}/app-summoner-sync/.github/workflows/trigger-java-code-quality.yml@feature/new-github-actions + uses: ${{ github.repository_owner }}/app-summoner-sync/.github/workflows/trigger-java-code-quality.yml@feature/new-github-actions diff --git a/.github/workflows/on-release.yml b/.github/workflows/on-release.yml index d8ddcaa..5e8a06f 100644 --- a/.github/workflows/on-release.yml +++ b/.github/workflows/on-release.yml @@ -7,8 +7,4 @@ on: jobs: call-release-workflow: - runs-on: ubuntu-latest - - steps: - - name: Call Release workflow from App Summoner Sync - uses: ${{ github.repository_owner }}/app-summoner-sync/.github/workflows/release-workflow.yml@feature/new-github-actions + uses: ${{ github.repository_owner }}/app-summoner-sync/.github/workflows/release-workflow.yml@feature/new-github-actions From 44082e31208243eb86f5a2a6cb25c927ea10fd34 Mon Sep 17 00:00:00 2001 From: Gonzalo Busto Musi Date: Fri, 27 Dec 2024 15:12:12 +0100 Subject: [PATCH 03/13] fix(gh-action): testing hardcoded org --- .github/workflows/on-main-pr-workflows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/on-main-pr-workflows.yml b/.github/workflows/on-main-pr-workflows.yml index 14aabb2..c055235 100644 --- a/.github/workflows/on-main-pr-workflows.yml +++ b/.github/workflows/on-main-pr-workflows.yml @@ -7,4 +7,4 @@ on: jobs: call-java-code-quality-workflow: - uses: ${{ github.repository_owner }}/app-summoner-sync/.github/workflows/trigger-java-code-quality.yml@feature/new-github-actions + uses: zerodaycode/app-summoner-sync/.github/workflows/trigger-java-code-quality.yml@feature/new-github-actions From 4284a9a615653138998f593d9164a172908014e7 Mon Sep 17 00:00:00 2001 From: Gonzalo Busto Musi Date: Fri, 27 Dec 2024 15:23:17 +0100 Subject: [PATCH 04/13] fix(gh-action): testing hardcoded org --- .github/workflows/on-all-pr-workflows.yml | 2 +- .github/workflows/on-release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/on-all-pr-workflows.yml b/.github/workflows/on-all-pr-workflows.yml index 5dee914..dc87b21 100644 --- a/.github/workflows/on-all-pr-workflows.yml +++ b/.github/workflows/on-all-pr-workflows.yml @@ -6,4 +6,4 @@ on: jobs: call-changelog-workflow: - uses: ${{ github.repository_owner }}/app-summoner-sync/.github/workflows/pr-changelog-preview.yml@feature/new-github-actions + uses: zerodaycode/app-summoner-sync/.github/workflows/pr-changelog-preview.yml@feature/new-github-actions diff --git a/.github/workflows/on-release.yml b/.github/workflows/on-release.yml index 5e8a06f..9fd42c5 100644 --- a/.github/workflows/on-release.yml +++ b/.github/workflows/on-release.yml @@ -7,4 +7,4 @@ on: jobs: call-release-workflow: - uses: ${{ github.repository_owner }}/app-summoner-sync/.github/workflows/release-workflow.yml@feature/new-github-actions + uses: zerodaycode/app-summoner-sync/.github/workflows/release-workflow.yml@feature/new-github-actions From 6cd387c524e568dc4f91efecd6abb23765676532 Mon Sep 17 00:00:00 2001 From: Gonzalo Busto Musi Date: Fri, 27 Dec 2024 15:31:46 +0100 Subject: [PATCH 05/13] fix(gh-action): Fixed reference to reusable workflow --- .github/workflows/on-all-pr-workflows.yml | 2 +- .github/workflows/on-main-pr-workflows.yml | 2 +- .github/workflows/on-release.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/on-all-pr-workflows.yml b/.github/workflows/on-all-pr-workflows.yml index dc87b21..a73fa3f 100644 --- a/.github/workflows/on-all-pr-workflows.yml +++ b/.github/workflows/on-all-pr-workflows.yml @@ -6,4 +6,4 @@ on: jobs: call-changelog-workflow: - uses: zerodaycode/app-summoner-sync/.github/workflows/pr-changelog-preview.yml@feature/new-github-actions + uses: ${{ github.repository_owner }}/app-summoners-sync/.github/workflows/pr-changelog-preview.yml@feature/new-github-actions diff --git a/.github/workflows/on-main-pr-workflows.yml b/.github/workflows/on-main-pr-workflows.yml index c055235..1eeac12 100644 --- a/.github/workflows/on-main-pr-workflows.yml +++ b/.github/workflows/on-main-pr-workflows.yml @@ -7,4 +7,4 @@ on: jobs: call-java-code-quality-workflow: - uses: zerodaycode/app-summoner-sync/.github/workflows/trigger-java-code-quality.yml@feature/new-github-actions + uses: ${{ github.repository_owner }}/app-summoners-sync/.github/workflows/trigger-java-code-quality.yml@feature/new-github-actions diff --git a/.github/workflows/on-release.yml b/.github/workflows/on-release.yml index 9fd42c5..8a14723 100644 --- a/.github/workflows/on-release.yml +++ b/.github/workflows/on-release.yml @@ -7,4 +7,4 @@ on: jobs: call-release-workflow: - uses: zerodaycode/app-summoner-sync/.github/workflows/release-workflow.yml@feature/new-github-actions + uses: ${{ github.repository_owner }}/app-summoners-sync/.github/workflows/release-workflow.yml@feature/new-github-actions From 75ec14ab4e0f2c1ddbabdbb55dc13bf3bf35b618 Mon Sep 17 00:00:00 2001 From: Gonzalo Busto Musi Date: Fri, 27 Dec 2024 15:34:55 +0100 Subject: [PATCH 06/13] fix(gh-action): Use org name directly --- .github/workflows/on-all-pr-workflows.yml | 2 +- .github/workflows/on-main-pr-workflows.yml | 2 +- .github/workflows/on-release.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/on-all-pr-workflows.yml b/.github/workflows/on-all-pr-workflows.yml index a73fa3f..b1ae652 100644 --- a/.github/workflows/on-all-pr-workflows.yml +++ b/.github/workflows/on-all-pr-workflows.yml @@ -6,4 +6,4 @@ on: jobs: call-changelog-workflow: - uses: ${{ github.repository_owner }}/app-summoners-sync/.github/workflows/pr-changelog-preview.yml@feature/new-github-actions + uses: zerodaycode/app-summoners-sync/.github/workflows/pr-changelog-preview.yml@feature/new-github-actions diff --git a/.github/workflows/on-main-pr-workflows.yml b/.github/workflows/on-main-pr-workflows.yml index 1eeac12..5a6c530 100644 --- a/.github/workflows/on-main-pr-workflows.yml +++ b/.github/workflows/on-main-pr-workflows.yml @@ -7,4 +7,4 @@ on: jobs: call-java-code-quality-workflow: - uses: ${{ github.repository_owner }}/app-summoners-sync/.github/workflows/trigger-java-code-quality.yml@feature/new-github-actions + uses: zerodaycode/app-summoners-sync/.github/workflows/trigger-java-code-quality.yml@feature/new-github-actions diff --git a/.github/workflows/on-release.yml b/.github/workflows/on-release.yml index 8a14723..d462c7b 100644 --- a/.github/workflows/on-release.yml +++ b/.github/workflows/on-release.yml @@ -7,4 +7,4 @@ on: jobs: call-release-workflow: - uses: ${{ github.repository_owner }}/app-summoners-sync/.github/workflows/release-workflow.yml@feature/new-github-actions + uses: zerodaycode/app-summoners-sync/.github/workflows/release-workflow.yml@feature/new-github-actions From 9cdee893a9dd50fdef83bee4e55c4107d0cbdd6b Mon Sep 17 00:00:00 2001 From: Gonzalo Busto Musi Date: Fri, 27 Dec 2024 16:52:05 +0100 Subject: [PATCH 07/13] chore(gh-action): Merged PR workflow in one --- .github/workflows/on-all-pr-workflows.yml | 9 --------- .github/workflows/on-main-pr-workflows.yml | 10 ---------- .github/workflows/on-pr-workflows.yml | 14 ++++++++++++++ 3 files changed, 14 insertions(+), 19 deletions(-) delete mode 100644 .github/workflows/on-all-pr-workflows.yml delete mode 100644 .github/workflows/on-main-pr-workflows.yml create mode 100644 .github/workflows/on-pr-workflows.yml diff --git a/.github/workflows/on-all-pr-workflows.yml b/.github/workflows/on-all-pr-workflows.yml deleted file mode 100644 index b1ae652..0000000 --- a/.github/workflows/on-all-pr-workflows.yml +++ /dev/null @@ -1,9 +0,0 @@ -name: On all Pull Requests - -on: - pull_request: - types: [opened, synchronize, reopened] - -jobs: - call-changelog-workflow: - uses: zerodaycode/app-summoners-sync/.github/workflows/pr-changelog-preview.yml@feature/new-github-actions diff --git a/.github/workflows/on-main-pr-workflows.yml b/.github/workflows/on-main-pr-workflows.yml deleted file mode 100644 index 5a6c530..0000000 --- a/.github/workflows/on-main-pr-workflows.yml +++ /dev/null @@ -1,10 +0,0 @@ -name: On PR to Main - -on: - pull_request: - branches: - - main - -jobs: - call-java-code-quality-workflow: - uses: zerodaycode/app-summoners-sync/.github/workflows/trigger-java-code-quality.yml@feature/new-github-actions diff --git a/.github/workflows/on-pr-workflows.yml b/.github/workflows/on-pr-workflows.yml new file mode 100644 index 0000000..b028d7a --- /dev/null +++ b/.github/workflows/on-pr-workflows.yml @@ -0,0 +1,14 @@ +name: On develop and main PR + +on: + pull_request: + types: [opened, synchronize, reopened] + branches: + - main + - develop + +jobs: + call-java-code-quality-workflow: + uses: zerodaycode/app-summoners-sync/.github/workflows/trigger-java-code-quality.yml@feature/new-github-actions + call-changelog-workflow: + uses: zerodaycode/app-summoners-sync/.github/workflows/pr-changelog-preview.yml@feature/new-github-actions \ No newline at end of file From 02afdd80f53464918bdd36f3ba74472de6dcc532 Mon Sep 17 00:00:00 2001 From: Gonzalo Busto Musi Date: Fri, 27 Dec 2024 16:55:21 +0100 Subject: [PATCH 08/13] fix(gh-action): Fixed called workflow name --- .github/workflows/on-pr-workflows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/on-pr-workflows.yml b/.github/workflows/on-pr-workflows.yml index b028d7a..0a64da9 100644 --- a/.github/workflows/on-pr-workflows.yml +++ b/.github/workflows/on-pr-workflows.yml @@ -9,6 +9,6 @@ on: jobs: call-java-code-quality-workflow: - uses: zerodaycode/app-summoners-sync/.github/workflows/trigger-java-code-quality.yml@feature/new-github-actions + uses: zerodaycode/app-summoners-sync/.github/workflows/unified-code-quality.yml@feature/new-github-actions call-changelog-workflow: uses: zerodaycode/app-summoners-sync/.github/workflows/pr-changelog-preview.yml@feature/new-github-actions \ No newline at end of file From 5d4c8a36c643500689c4518035c683accceaf84b Mon Sep 17 00:00:00 2001 From: Gonzalo Busto Musi Date: Fri, 27 Dec 2024 17:45:34 +0100 Subject: [PATCH 09/13] chore(gh-action): Name change --- .github/workflows/on-pr-workflows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/on-pr-workflows.yml b/.github/workflows/on-pr-workflows.yml index 0a64da9..f18717d 100644 --- a/.github/workflows/on-pr-workflows.yml +++ b/.github/workflows/on-pr-workflows.yml @@ -1,4 +1,4 @@ -name: On develop and main PR +name: Main & Develop PR Handlers on: pull_request: From 2e6bce91af28d9453a2e5ae9bd23ee6831b7502f Mon Sep 17 00:00:00 2001 From: Gonzalo Busto Musi Date: Fri, 27 Dec 2024 18:27:03 +0100 Subject: [PATCH 10/13] chore(gh-action): Name change --- .github/workflows/on-pr-workflows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/on-pr-workflows.yml b/.github/workflows/on-pr-workflows.yml index f18717d..46b37a0 100644 --- a/.github/workflows/on-pr-workflows.yml +++ b/.github/workflows/on-pr-workflows.yml @@ -1,4 +1,4 @@ -name: Main & Develop PR Handlers +name: Main and Develop PR Handlers on: pull_request: From 202e349e26aa64e4990ac16211df3441d1263225 Mon Sep 17 00:00:00 2001 From: Gonzalo Busto Musi Date: Fri, 27 Dec 2024 21:46:44 +0100 Subject: [PATCH 11/13] chore(pom): update dependencies version --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5d1bdf0..a93b20b 100644 --- a/pom.xml +++ b/pom.xml @@ -172,12 +172,12 @@ org.owasp dependency-check-maven - 8.4.0 + 9.0.10 org.jacoco jacoco-maven-plugin - 0.8.10 + 0.8.12 From 80c169c4af633be9487a4a9184a37705b46af044 Mon Sep 17 00:00:00 2001 From: Gonzalo Busto Musi Date: Sat, 28 Dec 2024 19:36:28 +0100 Subject: [PATCH 12/13] chore(pom): Changes on pmd rules --- pmd.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pmd.xml b/pmd.xml index 1d9a0c4..5c7ec25 100644 --- a/pmd.xml +++ b/pmd.xml @@ -1,22 +1,22 @@ - Custom ruleset for static code analysis using PMD. + Custom ruleset for static code analysis using PMD 7.x. - - - - - - + + + + + + - + - + From b6c6a70fc927b1a1e3f6e6d272ef5ab6739aea8a Mon Sep 17 00:00:00 2001 From: Gonzalo Busto Musi Date: Sat, 28 Dec 2024 20:00:02 +0100 Subject: [PATCH 13/13] chore(pom): Changes on pmd rules --- pmd.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pmd.xml b/pmd.xml index 5c7ec25..a8fa448 100644 --- a/pmd.xml +++ b/pmd.xml @@ -5,12 +5,12 @@ - - - - - - + + + + + +