From 934ab0b591d337b4b064c26b7e9ca2a8171be748 Mon Sep 17 00:00:00 2001 From: TheMeinerLP Date: Fri, 21 Aug 2026 19:17:01 +0200 Subject: [PATCH 1/4] chore(ci): adopt shared workflows and central Renovate preset - renovate.json -> central preset (gameruletemplate-maintainers) - security.yml (Trivy + CycloneDX SBOM) - build-pr.yml (gradle-build-pr, Java 21, run-tests: true) (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 | 38 ++++++++--------- .github/workflows/close_invalid_prs.yml | 12 ++---- .github/workflows/security.yml | 55 +++++++++++++++++++++++++ renovate.json | 8 +--- 4 files changed, 78 insertions(+), 35 deletions(-) create mode 100644 .github/workflows/security.yml diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index f74f587..714066a 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -1,23 +1,19 @@ name: Build PR -on: [pull_request] + +on: + pull_request: + +permissions: + contents: read + checks: write + pull-requests: write + jobs: - build_pr: - if: github.repository_owner == 'OneLiteFeatherNET' - name: Build Pull Request Branch - description: This job builds the pull request branch on different operating systems. - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-latest, windows-latest, macos-latest] - steps: - - name: Checkout Repository - uses: actions/checkout@v7 - - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@v3 - - name: Setup Java - uses: actions/setup-java@v5 - with: - distribution: temurin - java-version: 21 - - name: Build on ${{ matrix.os }} - run: ./gradlew clean build \ No newline at end of file + 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: true + secrets: inherit diff --git a/.github/workflows/close_invalid_prs.yml b/.github/workflows/close_invalid_prs.yml index 432d368..bd99444 100644 --- a/.github/workflows/close_invalid_prs.yml +++ b/.github/workflows/close_invalid_prs.yml @@ -2,13 +2,9 @@ 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..9c881bb --- /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: [develop] + schedule: + - cron: "25 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 36ad013..9d5f25a 100644 --- a/renovate.json +++ b/renovate.json @@ -1,11 +1,7 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ - "config:base", - ":semanticCommitsDisabled" + "github>OneLiteFeatherNET/renovate:default(OneLiteFeatherNET/gameruletemplate-maintainers)" ], - "ignoreDeps": [], - "labels": ["Renovate"], - "rebaseWhen": "conflicted", - "schedule": ["on the first day of the month"] + "ignoreDeps": [] } From e2d1ff95b1daf9b827a043947ddac53ca89f1e1c Mon Sep 17 00:00:00 2001 From: TheMeinerLP Date: Fri, 21 Aug 2026 20:15:51 +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 0.0.0 - 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..e8c2ce0 --- /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: [develop] + 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..e18ee07 --- /dev/null +++ b/.release-please-manifest.json @@ -0,0 +1,3 @@ +{ + ".": "0.0.0" +} 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..c13fffa --- /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": "GameRuleTemplate", + "changelog-path": "CHANGELOG.md" + } + } +} From 8457017bf770e65d1ca07005c7278e92bb95723e Mon Sep 17 00:00:00 2001 From: TheMeinerLP Date: Fri, 21 Aug 2026 20:16:12 +0200 Subject: [PATCH 3/4] chore(ci): publish from the release-please run instead of a tag trigger release-please tags with GITHUB_TOKEN, and a tag pushed that way does not start an `on: push: tags` workflow - so the old publish workflow would never have fired on a release. Chain the publish into the release-please run, gated on release_created. --- .github/workflows/release-please.yml | 11 +++++ .github/workflows/tag-build.yml | 64 ---------------------------- 2 files changed, 11 insertions(+), 64 deletions(-) delete mode 100644 .github/workflows/tag-build.yml diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index e8c2ce0..c6594f2 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -18,6 +18,17 @@ jobs: uses: OneLiteFeatherNET/workflows/.github/workflows/release-please.yml@v2.8.1 secrets: inherit + + publish: + name: Publish to OneLiteFeatherRepo + needs: release-please + if: needs.release-please.outputs.release_created == 'true' + uses: OneLiteFeatherNET/workflows/.github/workflows/gradle-publish.yml@v2.8.1 + with: + java-version: "21" + java-distribution: "temurin" + publish-task: "publish" + secrets: inherit sbom: name: Attach SBOM to release needs: release-please diff --git a/.github/workflows/tag-build.yml b/.github/workflows/tag-build.yml deleted file mode 100644 index c8eb1b4..0000000 --- a/.github/workflows/tag-build.yml +++ /dev/null @@ -1,64 +0,0 @@ -name: Tag Build - -on: - push: - tags: - - '*' - -jobs: - build: - runs-on: ubuntu-latest - container: - image: gradle:9.6.1-jdk21 - env: - GRADLE_OPTS: "-Dorg.gradle.internal.launcher.welcomeMessageEnabled=false" - steps: - - name: Checkout code - uses: actions/checkout@v7 - - name: Cache Gradle packages - uses: actions/cache@v6 - with: - path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: | - ${{ runner.os }}-gradle- - - name: Build - run: gradle build -x test - - test: - runs-on: ubuntu-latest - container: - image: gradle:9.6.1-jdk21 - env: - GRADLE_OPTS: "-Dorg.gradle.internal.launcher.welcomeMessageEnabled=false" - steps: - - name: Checkout code - uses: actions/checkout@v7 - - name: Cache Gradle packages - uses: actions/cache@v6 - with: - path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: | - ${{ runner.os }}-gradle- - - name: Test - run: gradle test - - publish: - runs-on: ubuntu-latest - container: - image: gradle:9.6.1-jdk21 - env: - GRADLE_OPTS: "-Dorg.gradle.internal.launcher.welcomeMessageEnabled=false" - steps: - - name: Checkout code - uses: actions/checkout@v7 - - name: Cache Gradle packages - uses: actions/cache@v6 - with: - path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: | - ${{ runner.os }}-gradle- - - name: Publish - run: gradle publish \ No newline at end of file From 9d1e8bfbd04f63e8678aca66f633d07024daaeac Mon Sep 17 00:00:00 2001 From: TheMeinerLP Date: Fri, 21 Aug 2026 21:12:58 +0200 Subject: [PATCH 4/4] fix(ci): restore Renovate platform presets and anchor the version in build.gradle.kts - renovate flavor restored: paper - marker added to the existing version literal; extra-files now points at build.gradle.kts - bootstrap-sha set from tip of develop (no version tag yet) --- build.gradle.kts | 2 +- release-please-config.json | 11 +++++++++-- renovate.json | 3 ++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 728710b..b474ac8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { } group = "net.onelitefeather" -version = "1.0.0" +version = "0.0.0" // x-release-please-version dependencies { compileOnly(libs.paper) diff --git a/release-please-config.json b/release-please-config.json index c13fffa..1ab53f6 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -6,7 +6,14 @@ "packages": { ".": { "package-name": "GameRuleTemplate", - "changelog-path": "CHANGELOG.md" + "changelog-path": "CHANGELOG.md", + "extra-files": [ + { + "type": "generic", + "path": "build.gradle.kts" + } + ] } - } + }, + "bootstrap-sha": "bda53b2e730899c01e0eda8a068f79f8ab2eaf30" } diff --git a/renovate.json b/renovate.json index 9d5f25a..ef391bb 100644 --- a/renovate.json +++ b/renovate.json @@ -1,7 +1,8 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ - "github>OneLiteFeatherNET/renovate:default(OneLiteFeatherNET/gameruletemplate-maintainers)" + "github>OneLiteFeatherNET/renovate:default(OneLiteFeatherNET/gameruletemplate-maintainers)", + "github>OneLiteFeatherNET/renovate:paper" ], "ignoreDeps": [] }