From c8ca057bd8dfc9e84122d934043d283d37037fa0 Mon Sep 17 00:00:00 2001 From: TheMeinerLP Date: Fri, 21 Aug 2026 19:15:36 +0200 Subject: [PATCH 1/4] chore(ci): adopt shared workflows and central Renovate preset - renovate.json -> central preset (attollo-maintainers) - security.yml (Trivy + CycloneDX SBOM) - build-pr.yml (gradle-build-pr, Java 21, run-tests: false) (replaced hand-rolled job) - close_invalid_prs.yml (replaced hand-rolled job) - pinned reusable workflows to v2.8.1 (close_invalid_prs.yml,build-pr.yml) --- .github/workflows/build-pr.yml | 39 ++++++++---------- .github/workflows/close_invalid_prs.yml | 14 +++---- .github/workflows/security.yml | 55 +++++++++++++++++++++++++ renovate.json | 3 +- 4 files changed, 79 insertions(+), 32 deletions(-) create mode 100644 .github/workflows/security.yml diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 0bfb5ee..4735d57 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -1,22 +1,19 @@ -name: Build Pull Request -on: [pull_request] +name: Build PR + +on: + pull_request: + +permissions: + contents: read + checks: write + pull-requests: write + jobs: - build_pr: - name: Check PR if can build - if: github.repository_owner == 'OneLiteFeatherNET' - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-latest, windows-latest, macos-latest] - steps: - - name: Checkout Repository - uses: actions/checkout@v7 - - name: Setup Gradle - uses: gradle/actions/setup-gradle@v6 - - name: Setup Java - uses: actions/setup-java@v5 - with: - distribution: temurin - java-version: 21 - - name: Build on ${{ matrix.os }} - run: ./gradlew clean build + build: + # Shared org build: Temurin toolchain, 3-OS matrix, tests and coverage. + uses: OneLiteFeatherNET/workflows/.github/workflows/gradle-build-pr.yml@v2.8.1 + with: + java-version: "21" + java-distribution: "temurin" + run-tests: false + secrets: inherit diff --git a/.github/workflows/close_invalid_prs.yml b/.github/workflows/close_invalid_prs.yml index 68a00c5..bd99444 100644 --- a/.github/workflows/close_invalid_prs.yml +++ b/.github/workflows/close_invalid_prs.yml @@ -1,14 +1,10 @@ -name: Close invalid Pull Requests +name: Close invalid PRs on: pull_request_target: - types: [ opened ] + types: [opened] jobs: - run: - if: ${{ github.repository != github.event.pull_request.head.repo.full_name && github.head_ref == 'main' }} - runs-on: ubuntu-latest - steps: - - uses: superbrothers/close-pull-request@v3 - with: - comment: "Please do not open pull requests from the `main` branch, create a new branch instead." \ No newline at end of file + close: + uses: OneLiteFeatherNET/workflows/.github/workflows/close-invalid-prs.yml@v2.8.1 + secrets: inherit diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml new file mode 100644 index 0000000..e295875 --- /dev/null +++ b/.github/workflows/security.yml @@ -0,0 +1,55 @@ +name: Security + +# Trivy vulnerability gate plus a CycloneDX SBOM of the repository. Self-contained +# on purpose: it needs no build tool and no registry credentials, so it is the +# baseline security gate for every repository regardless of language. +on: + pull_request: + push: + branches: [main] + schedule: + - cron: "37 3 * * 1" + workflow_dispatch: +permissions: + contents: read + security-events: write + +jobs: + trivy: + name: Trivy scan + uses: OneLiteFeatherNET/workflows/.github/workflows/security-scan.yml@v2.8.1 + with: + scan-type: "fs" + scanners: "vuln,secret" + severity: "CRITICAL,HIGH" + # Report-only for now, so adopting this does not turn CI red on day one. + fail-on-findings: false + upload-sarif: true + secrets: inherit + + sbom: + name: CycloneDX SBOM + runs-on: ubuntu-latest + permissions: + contents: read + steps: + - name: Checkout + uses: actions/checkout@v6 + + - name: Generate SBOM + uses: aquasecurity/trivy-action@v0.36.0 + with: + scan-type: fs + scan-ref: . + format: cyclonedx + output: bom.json + # An SBOM is an inventory, not a finding list - never fail on it. + exit-code: '0' + + - name: Upload SBOM + uses: actions/upload-artifact@v4 + with: + name: sbom-cyclonedx + path: bom.json + if-no-files-found: error + retention-days: 90 diff --git a/renovate.json b/renovate.json index e3c731b..1e67b31 100644 --- a/renovate.json +++ b/renovate.json @@ -1,7 +1,6 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ - "github>OneLiteFeatherNET/renovate:default(OneLiteFeatherNET/attollo-maintainers)", - "github>OneLiteFeatherNET/renovate:paper" + "github>OneLiteFeatherNET/renovate:default(OneLiteFeatherNET/attollo-maintainers)" ] } From 4c62f8787bd46dafe01d8f64293b138506b1aee2 Mon Sep 17 00:00:00 2001 From: TheMeinerLP Date: Fri, 21 Aug 2026 20:24:19 +0200 Subject: [PATCH 2/4] chore(ci): add release-please, PR linting and release SBOMs - pr-lint.yml - commitlint.config.mjs - release-please simple mode, bootstrapped at 1.5.8 - release-please.yml with SBOM attached to the release --- .github/workflows/pr-lint.yml | 17 ++++++++++ .github/workflows/release-please.yml | 48 ++++++++++++++++++++++++++++ .release-please-manifest.json | 3 ++ commitlint.config.mjs | 3 ++ release-please-config.json | 12 +++++++ 5 files changed, 83 insertions(+) create mode 100644 .github/workflows/pr-lint.yml create mode 100644 .github/workflows/release-please.yml create mode 100644 .release-please-manifest.json create mode 100644 commitlint.config.mjs create mode 100644 release-please-config.json diff --git a/.github/workflows/pr-lint.yml b/.github/workflows/pr-lint.yml new file mode 100644 index 0000000..759b37b --- /dev/null +++ b/.github/workflows/pr-lint.yml @@ -0,0 +1,17 @@ +name: PR Lint + +# Conventional Commits on the PR title and every commit on the branch. +# release-please parses those commit types to decide the version bump and to +# build the changelog - a non-conventional commit silently produces neither. +on: + pull_request: + types: [opened, edited, synchronize, reopened] + +permissions: + contents: read + pull-requests: read + +jobs: + lint: + uses: OneLiteFeatherNET/workflows/.github/workflows/pr-lint.yml@v2.8.1 + secrets: inherit diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml new file mode 100644 index 0000000..6e0e1ca --- /dev/null +++ b/.github/workflows/release-please.yml @@ -0,0 +1,48 @@ +name: Release + +# release-please collects Conventional Commits into a release PR; merging it +# tags the version and cuts the GitHub release. Everything that has to happen +# for a release is chained into this same run on purpose: release-please tags +# with GITHUB_TOKEN, and a tag pushed that way does NOT start a separate +# `on: push: tags` workflow. +on: + push: + branches: [main] + workflow_dispatch: +permissions: + contents: write + pull-requests: write + +jobs: + release-please: + uses: OneLiteFeatherNET/workflows/.github/workflows/release-please.yml@v2.8.1 + secrets: inherit + + sbom: + name: Attach SBOM to release + needs: release-please + if: needs.release-please.outputs.release_created == 'true' + runs-on: ubuntu-latest + permissions: + contents: write + steps: + - name: Checkout + uses: actions/checkout@v6 + with: + ref: ${{ needs.release-please.outputs.tag_name }} + + - name: Generate CycloneDX SBOM + uses: aquasecurity/trivy-action@v0.36.0 + with: + scan-type: fs + scan-ref: . + format: cyclonedx + output: bom.json + # An SBOM is an inventory, not a finding list - never fail on it. + exit-code: '0' + + - name: Attach SBOM to the release + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + TAG: ${{ needs.release-please.outputs.tag_name }} + run: gh release upload "$TAG" bom.json --clobber diff --git a/.release-please-manifest.json b/.release-please-manifest.json new file mode 100644 index 0000000..4aeeaa4 --- /dev/null +++ b/.release-please-manifest.json @@ -0,0 +1,3 @@ +{ + ".": "1.5.8" +} diff --git a/commitlint.config.mjs b/commitlint.config.mjs new file mode 100644 index 0000000..0616fb9 --- /dev/null +++ b/commitlint.config.mjs @@ -0,0 +1,3 @@ +export default { + extends: ['@commitlint/config-conventional'], +}; diff --git a/release-please-config.json b/release-please-config.json new file mode 100644 index 0000000..77e3ec2 --- /dev/null +++ b/release-please-config.json @@ -0,0 +1,12 @@ +{ + "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json", + "release-type": "simple", + "include-component-in-tag": false, + "include-v-in-tag": true, + "packages": { + ".": { + "package-name": "Attollo", + "changelog-path": "CHANGELOG.md" + } + } +} From ace0ca41ada429f7f21346f2f5eba763ed84ff97 Mon Sep 17 00:00:00 2001 From: TheMeinerLP Date: Fri, 21 Aug 2026 20:27:14 +0200 Subject: [PATCH 3/4] chore(release): move publishing into the release-please run release-please tags with GITHUB_TOKEN, and a tag pushed that way does not start an `on: push: tags` workflow - so the previous publish would never have fired on a release. The same commands now run as a job in the release-please run, gated on release_created, with the version taken from the release-please output. --- .github/workflows/publish.yml | 67 ---------------------------- .github/workflows/release-please.yml | 50 +++++++++++++++++++++ .releaserc.json | 41 ----------------- 3 files changed, 50 insertions(+), 108 deletions(-) delete mode 100644 .github/workflows/publish.yml delete mode 100644 .releaserc.json diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml deleted file mode 100644 index 8195b5d..0000000 --- a/.github/workflows/publish.yml +++ /dev/null @@ -1,67 +0,0 @@ -name: Release -"on": - push: - branches: - - main - - next - - beta - - alpha - - "*.x" - -permissions: - contents: read # for checkout - -jobs: - release: - name: Release - runs-on: ubuntu-latest - permissions: - contents: write # to be able to publish a GitHub release - issues: write # to be able to comment on released issues - pull-requests: write # to be able to comment on released pull requests - id-token: write # to enable use of OIDC for npm provenance - steps: - - name: Checkout - uses: actions/checkout@v7 - with: - fetch-depth: 0 - - name: Setup Node.js - uses: actions/setup-node@v7 - with: - node-version: "lts/*" - - name: Validate Gradle Wrapper - uses: gradle/actions/wrapper-validation@v6 - - name: Setup Java - uses: actions/setup-java@v5 - with: - distribution: temurin - java-version: 24 - - name: Setup Gradle - uses: gradle/actions/setup-gradle@v6 - - name: Install dependencies - run: npm clean-install - - name: Verify the integrity of provenance attestations and registry signatures for installed dependencies - run: npm audit signatures - - name: Release - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - NPM_TOKEN: ${{ secrets.NPM_TOKEN }} - HANGAR_SECRET: ${{secrets.HANGAR_KEY}} - MODRINTH_TOKEN: ${{ secrets.MODRINTH_KEY }} - # Token with permissions to push to the client repository - CLIENT_REPO_TOKEN: ${{ secrets.CLIENT_REPO_TOKEN }} - run: npx semantic-release - - name: Get Version - id: get_version - run: echo "VERSION=$(cat VERSION.txt)" >> $GITHUB_ENV - - name: Upload BOM to Dependency-Track - uses: DependencyTrack/gh-upload-sbom@v4 - with: - serverhostname: ${{ secrets.DEPENDENCYTRACK_HOSTNAME }} - apikey: ${{ secrets.DEPENDENCYTRACK_APIKEY }} - projectname: "Attollo" - projectversion: ${{ env.VERSION }} - projecttags: 'bukkit,paper,plugin' - bomfilename: "build/reports/cyclonedx/bom.xml" - autocreate: true - parent: 'becbe738-ef2b-4333-bd13-477ab794d76a' diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 6e0e1ca..9bac2c6 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -18,6 +18,56 @@ jobs: uses: OneLiteFeatherNET/workflows/.github/workflows/release-please.yml@v2.8.1 secrets: inherit + publish: + name: Publish to Hangar and Modrinth + needs: release-please + if: needs.release-please.outputs.release_created == 'true' + runs-on: ubuntu-latest + permissions: + contents: write + env: + HANGAR_SECRET: ${{ secrets.HANGAR_KEY }} + MODRINTH_TOKEN: ${{ secrets.MODRINTH_KEY }} + steps: + - name: Checkout the released tag + uses: actions/checkout@v6 + with: + ref: ${{ needs.release-please.outputs.tag_name }} + + - name: Validate Gradle wrapper + uses: gradle/actions/wrapper-validation@v6 + + - name: Set up JDK + uses: actions/setup-java@v5 + with: + distribution: temurin + java-version: "24" + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v6 + + # Same command semantic-release ran as its publishCmd, with the version + # coming from release-please instead of from ${nextRelease.version}. + - name: Build and publish + run: ./gradlew -Pversion=${{ needs.release-please.outputs.version }} shadowJar publishAllPublicationsToHangar modrinth cyclonedxBom + + - name: Attach the plugin JAR to the release + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + TAG: ${{ needs.release-please.outputs.tag_name }} + run: gh release upload "$TAG" build/libs/Attollo-*.jar --clobber + + - name: Upload SBOM to Dependency-Track + uses: DependencyTrack/gh-upload-sbom@v4 + with: + serverhostname: ${{ secrets.DEPENDENCYTRACK_HOSTNAME }} + apikey: ${{ secrets.DEPENDENCYTRACK_APIKEY }} + projectname: "Attollo" + projectversion: ${{ needs.release-please.outputs.version }} + projecttags: 'bukkit,paper,plugin' + bomfilename: "build/reports/cyclonedx/bom.xml" + autocreate: true + parent: 'becbe738-ef2b-4333-bd13-477ab794d76a' sbom: name: Attach SBOM to release needs: release-please diff --git a/.releaserc.json b/.releaserc.json deleted file mode 100644 index f207ccf..0000000 --- a/.releaserc.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "plugins": [ - [ - "@semantic-release/commit-analyzer", - { - "preset": "conventionalcommits" - } - ], - [ - "@semantic-release/exec", - { - "verifyConditionsCmd": "./gradlew check", - "publishCmd": "./gradlew -Pversion=${nextRelease.version} shadowJar publishAllPublicationsToHangar modrinth cyclonedxBom && echo '${nextRelease.version}' > VERSION.txt" - } - ], - [ - "@semantic-release/changelog", - { - "changelogFile": "CHANGELOG.md" - } - ], - [ - "@semantic-release/git", - { - "assets": ["CHANGELOG.md"] - } - ], - "@semantic-release/git", - "@semantic-release/release-notes-generator", - [ - "@semantic-release/github", - { - "assets": [ - { - "path": "build/libs/Attollo-*.jar" - } - ] - } - ] - ] -} \ No newline at end of file From feae3433081e2a2cc412edbbc10448b1d3e9aaf7 Mon Sep 17 00:00:00 2001 From: TheMeinerLP Date: Fri, 21 Aug 2026 21:11:46 +0200 Subject: [PATCH 4/4] fix(ci): restore Renovate platform presets and anchor the version in build.gradle.kts - renovate flavor restored: paper - version line introduced (the project had none); removed the now-unused version from gradle.properties; extra-files now points at build.gradle.kts - bootstrap-sha set from tag v1.5.8 --- build.gradle.kts | 2 ++ gradle.properties | 1 - release-please-config.json | 11 +++++++++-- renovate.json | 3 ++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index ffcc4db..cf90a20 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -15,6 +15,8 @@ plugins { jacoco } +version = "1.5.8" // x-release-please-version + if (!File("$rootDir/.git").exists()) { logger.lifecycle( """ diff --git a/gradle.properties b/gradle.properties index 2dcd025..5754614 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,5 @@ kotlin.code.style=official ### Project Settings -version = 999.0.0-SNAPSHOT group = net.onelitefeather ## Gradle Settings diff --git a/release-please-config.json b/release-please-config.json index 77e3ec2..40e7281 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -6,7 +6,14 @@ "packages": { ".": { "package-name": "Attollo", - "changelog-path": "CHANGELOG.md" + "changelog-path": "CHANGELOG.md", + "extra-files": [ + { + "type": "generic", + "path": "build.gradle.kts" + } + ] } - } + }, + "bootstrap-sha": "1eb2ddfaacc861b3277458527c8f823a6372319a" } diff --git a/renovate.json b/renovate.json index 1e67b31..e3c731b 100644 --- a/renovate.json +++ b/renovate.json @@ -1,6 +1,7 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ - "github>OneLiteFeatherNET/renovate:default(OneLiteFeatherNET/attollo-maintainers)" + "github>OneLiteFeatherNET/renovate:default(OneLiteFeatherNET/attollo-maintainers)", + "github>OneLiteFeatherNET/renovate:paper" ] }