From 7dc792e49690e087ea2a41de90a34d046fe95706 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sat, 18 Nov 2023 14:23:51 +0100 Subject: [PATCH 1/4] ci: remove sonarqube from refinedarchitect --- README.md | 2 +- build.gradle | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 0018713..e79b054 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Refined Architect [![Build Status](https://github.com/refinedmods/refinedarchitect/actions/workflows/build.yml/badge.svg?branch=develop)](https://github.com/refinedmods/refinedarchitect/actions/workflows/build.yml) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=refinedmods_refinedarchitect&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=refinedmods_refinedarchitect) [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=refinedmods_refinedarchitect&metric=coverage)](https://sonarcloud.io/summary/new_code?id=refinedmods_refinedarchitect) [![Code Smells](https://sonarcloud.io/api/project_badges/measure?project=refinedmods_refinedarchitect&metric=code_smells)](https://sonarcloud.io/summary/new_code?id=refinedmods_refinedarchitect) [![Discord](https://img.shields.io/discord/342942776494653441)](https://discordapp.com/invite/VYzsydb) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE.md) +# Refined Architect [![Build Status](https://github.com/refinedmods/refinedarchitect/actions/workflows/build.yml/badge.svg?branch=develop)](https://github.com/refinedmods/refinedarchitect/actions/workflows/build.yml) [![Discord](https://img.shields.io/discord/342942776494653441)](https://discordapp.com/invite/VYzsydb) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE.md) ## About diff --git a/build.gradle b/build.gradle index b2df98d..4ef0860 100644 --- a/build.gradle +++ b/build.gradle @@ -3,5 +3,3 @@ apply from: 'helper.gradle' subprojects { group = 'com.refinedmods.refinedarchitect' } - -enableSonarQube("refinedmods_refinedarchitect") \ No newline at end of file From ccd3e6d8cc8ce3bd58cb4394c89babee572d8d0f Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sat, 18 Nov 2023 14:28:49 +0100 Subject: [PATCH 2/4] ci: disable sonarqube from workflows --- .github/workflows/build-internal.yml | 1 + .github/workflows/publish-release-internal.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/build-internal.yml b/.github/workflows/build-internal.yml index b8a7759..5736b4a 100644 --- a/.github/workflows/build-internal.yml +++ b/.github/workflows/build-internal.yml @@ -12,3 +12,4 @@ jobs: secrets: inherit with: mutation-testing: false + sonarqube: false diff --git a/.github/workflows/publish-release-internal.yml b/.github/workflows/publish-release-internal.yml index d3dc33b..8feddcb 100644 --- a/.github/workflows/publish-release-internal.yml +++ b/.github/workflows/publish-release-internal.yml @@ -14,3 +14,4 @@ jobs: project-name: 'Refined Architect' announce: false javadoc: false + sonarqube: false From 743967f86cbd1324881f4128c7a84afc2f875eeb Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Tue, 26 Dec 2023 00:10:33 +0100 Subject: [PATCH 3/4] chore: update github action versions --- .github/actions/setup-java/action.yml | 2 +- .github/workflows/build.yml | 6 ++--- .github/workflows/draft-release.yml | 6 ++--- .../issue-for-unsupported-version.yml | 2 +- .github/workflows/publish-release.yml | 22 +++++++++---------- .github/workflows/resolved-issue-locking.yml | 6 ++--- .github/workflows/validate-branch-name.yml | 4 ++-- .github/workflows/validate-changelog.yml | 4 ++-- .../workflows/validate-commit-messages.yml | 2 +- CHANGELOG.md | 4 ++++ 10 files changed, 31 insertions(+), 27 deletions(-) diff --git a/.github/actions/setup-java/action.yml b/.github/actions/setup-java/action.yml index b9c2deb..420b4e5 100644 --- a/.github/actions/setup-java/action.yml +++ b/.github/actions/setup-java/action.yml @@ -6,7 +6,7 @@ runs: - name: Validate Gradle wrapper uses: gradle/wrapper-validation-action@v1 - name: Setup JDK 17 - uses: actions/setup-java@v3.9.0 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: 17 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 445f2bf..93451d2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ jobs: run: | echo "RELEASE_VERSION=${{ inputs.version }}" >> $GITHUB_ENV - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - name: Setup Java @@ -46,7 +46,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - name: Publish test report - uses: mikepenz/action-junit-report@v3 + uses: mikepenz/action-junit-report@v4 if: always() with: report_paths: '**/build/test-results/test/TEST-*.xml' @@ -61,7 +61,7 @@ jobs: run: ./gradlew pitest - name: Upload build artifacts if: ${{ runner.os == 'Linux' }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: Artifacts path: '**/build/libs/' diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index 1049bc3..98f49df 100644 --- a/.github/workflows/draft-release.yml +++ b/.github/workflows/draft-release.yml @@ -31,7 +31,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: token: ${{ secrets.GITFLOW_PUSH_TOKEN }} - name: Get latest version from changelog @@ -56,7 +56,7 @@ jobs: run: | echo "VERSION=${{ github.event.inputs.version-number-override }}" >> $GITHUB_ENV - name: Update changelog - uses: thomaseizinger/keep-a-changelog-new-release@1.3.0 + uses: thomaseizinger/keep-a-changelog-new-release@ec0871fec381db64ab389886ffe8e6fc2b661e2c with: version: ${{ env.VERSION }} tag: v${{ env.VERSION }} @@ -69,7 +69,7 @@ jobs: new_branch: 'release/${{ env.VERSION }}' push: true - name: Create pull request for release - uses: thomaseizinger/create-pull-request@1.3.0 + uses: thomaseizinger/create-pull-request@52baa147b387effeeb9cf04e121227dbfb74994e env: GITHUB_TOKEN: ${{ secrets.GITFLOW_PUSH_TOKEN }} with: diff --git a/.github/workflows/issue-for-unsupported-version.yml b/.github/workflows/issue-for-unsupported-version.yml index aeafe7a..4d91dc2 100644 --- a/.github/workflows/issue-for-unsupported-version.yml +++ b/.github/workflows/issue-for-unsupported-version.yml @@ -7,7 +7,7 @@ jobs: unsupported-labeler: runs-on: ubuntu-latest steps: - - uses: dessant/support-requests@v3 + - uses: dessant/support-requests@v4 with: github-token: ${{ github.token }} support-label: 'unsupported' diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 963fcc5..af2ae4e 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -39,7 +39,7 @@ jobs: version: ${{ env.RELEASE_VERSION }} steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Extract version from release branch name if: startsWith(github.event.pull_request.head.ref, 'release/') run: | @@ -61,10 +61,10 @@ jobs: changelog: ${{ steps.changelog_reader.outputs.changes }} steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Extract changelog id: changelog_reader - uses: mindsers/changelog-reader-action@v2.2.2 + uses: mindsers/changelog-reader-action@v2 with: version: ${{ needs.extract-version-number.outputs.version }} path: ./CHANGELOG.md @@ -87,7 +87,7 @@ jobs: RELEASE_VERSION: ${{ needs.extract-version-number.outputs.version }} steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Java uses: refinedmods/refinedarchitect/.github/actions/setup-java@develop - name: Publish to Maven @@ -106,13 +106,13 @@ jobs: RELEASE_VERSION: ${{ needs.extract-version-number.outputs.version }} steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Java uses: refinedmods/refinedarchitect/.github/actions/setup-java@develop - name: Build documentation run: ./gradlew allJavadoc - name: Publish documentation - uses: JamesIves/github-pages-deploy-action@v4.4.1 + uses: JamesIves/github-pages-deploy-action@v4 with: branch: gh-pages folder: build/docs/javadoc @@ -128,7 +128,7 @@ jobs: release-url: ${{ steps.gh_release.outputs.url }} steps: - name: Download artifacts - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: Artifacts - name: Deploy to GitHub Releases @@ -153,7 +153,7 @@ jobs: CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }} steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Java uses: refinedmods/refinedarchitect/.github/actions/setup-java@develop - name: Deploy to CurseForge @@ -170,7 +170,7 @@ jobs: MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }} steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Java uses: refinedmods/refinedarchitect/.github/actions/setup-java@develop - name: Deploy to Modrinth @@ -200,7 +200,7 @@ jobs: if: ${{ inputs.announce == true }} steps: - name: Announce to Mastodon - uses: rzr/fediverse-action@master + uses: rzr/fediverse-action@8506cb8a3052fd34b0d93a244888a81c233abf88 with: access-token: ${{ secrets.MASTODON_TOKEN }} host: 'anvil.social' @@ -213,7 +213,7 @@ jobs: (startsWith(github.event.pull_request.head.ref, 'release/') || startsWith(github.event.pull_request.head.ref, 'hotfix/')) steps: - name: Create PR for merging main back into develop - uses: thomaseizinger/create-pull-request@1.0.0 + uses: thomaseizinger/create-pull-request@52baa147b387effeeb9cf04e121227dbfb74994e env: GITHUB_TOKEN: ${{ secrets.GITFLOW_PUSH_TOKEN }} with: diff --git a/.github/workflows/resolved-issue-locking.yml b/.github/workflows/resolved-issue-locking.yml index 9126f1d..e9d2395 100644 --- a/.github/workflows/resolved-issue-locking.yml +++ b/.github/workflows/resolved-issue-locking.yml @@ -7,8 +7,8 @@ jobs: lock: runs-on: ubuntu-latest steps: - - uses: dessant/lock-threads@v2 + - uses: dessant/lock-threads@v5 with: github-token: ${{ github.token }} - issue-lock-inactive-days: '30' - pr-lock-inactive-days: '30' \ No newline at end of file + issue-inactive-days: '30' + pr-inactive-days: '30' \ No newline at end of file diff --git a/.github/workflows/validate-branch-name.yml b/.github/workflows/validate-branch-name.yml index c30fd86..91c12df 100644 --- a/.github/workflows/validate-branch-name.yml +++ b/.github/workflows/validate-branch-name.yml @@ -6,7 +6,7 @@ jobs: steps: - name: Validate if branch name is valid if: (!startsWith(github.event.pull_request.head.ref, 'release/')) && (!startsWith(github.event.pull_request.head.ref, 'hotfix/')) - uses: deepakputhraya/action-branch-name@master + uses: deepakputhraya/action-branch-name@5f1cc199284b75145ec2d13434422e6987cf6af8 with: regex: '^([a-z])+\/GH-\d*\/([a-z-])+$' allowed_prefixes: 'build,chore,ci,docs,feat,fix,perf,refactor,revert,style,test' @@ -15,7 +15,7 @@ jobs: max_length: 50 - name: Validate if release or hotfix branch name is valid if: startsWith(github.event.pull_request.head.ref, 'release/') || startsWith(github.event.pull_request.head.ref, 'hotfix/') - uses: deepakputhraya/action-branch-name@master + uses: deepakputhraya/action-branch-name@5f1cc199284b75145ec2d13434422e6987cf6af8 with: regex: '^([a-z])+\/(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$' allowed_prefixes: 'release,hotfix' diff --git a/.github/workflows/validate-changelog.yml b/.github/workflows/validate-changelog.yml index 7840031..3fe4a62 100644 --- a/.github/workflows/validate-changelog.yml +++ b/.github/workflows/validate-changelog.yml @@ -11,9 +11,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Validate if changelog is valid - uses: mindsers/changelog-reader-action@v2.2.2 + uses: mindsers/changelog-reader-action@v2 with: path: ./CHANGELOG.md validation_level: ${{ inputs.validation-level }} diff --git a/.github/workflows/validate-commit-messages.yml b/.github/workflows/validate-commit-messages.yml index 97c8a06..7caede8 100644 --- a/.github/workflows/validate-commit-messages.yml +++ b/.github/workflows/validate-commit-messages.yml @@ -4,7 +4,7 @@ jobs: commitlint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - uses: wagoid/commitlint-github-action@v5 \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index eb939e4..11bd787 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Changed + +- Upgraded GitHub Actions versions. + ## [0.9.1] - 2023-10-31 ### Fixed From 1945792b0af5c9ae1086d1edc308086d1337ec90 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Mon, 25 Dec 2023 23:20:53 +0000 Subject: [PATCH 4/4] chore: prepare release v0.10.0 --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 11bd787..aedacf5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [0.10.0] - 2023-12-25 + ### Changed - Upgraded GitHub Actions versions. @@ -165,7 +167,9 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). - Gradle helpers for Fabric and Forge projects. - CI workflows. -[Unreleased]: https://github.com/refinedmods/refinedarchitect/compare/v0.9.1...HEAD +[Unreleased]: https://github.com/refinedmods/refinedarchitect/compare/v0.10.0...HEAD + +[0.10.0]: https://github.com/refinedmods/refinedarchitect/compare/v0.9.1...v0.10.0 [0.9.1]: https://github.com/refinedmods/refinedarchitect/compare/v0.9.0...v0.9.1