From b6cb0c53e91a6ae93fffb20d4865ee4e503f430b Mon Sep 17 00:00:00 2001 From: TheMeinerLP Date: Fri, 21 Aug 2026 19:16:27 +0200 Subject: [PATCH 1/3] chore(ci): adopt shared workflows and central Renovate preset - renovate.json -> central preset (cygnus-maintainers) - security.yml (Trivy + CycloneDX SBOM) --- .github/workflows/security.yml | 55 ++++++++++++++++++++++++++++++++++ renovate.json | 5 ++-- 2 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/security.yml diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml new file mode 100644 index 00000000..e2958753 --- /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 d5fb3982..ffc94b0f 100644 --- a/renovate.json +++ b/renovate.json @@ -1,8 +1,7 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ - "github>OneLiteFeatherNET/renovate:default(OneLiteFeatherNET/cygnus-maintainers)", - "github>OneLiteFeatherNET/renovate:minestom" + "github>OneLiteFeatherNET/renovate:default(OneLiteFeatherNET/cygnus-maintainers)" ], "packageRules": [ { @@ -12,4 +11,4 @@ "allowedVersions": "<=4.0.0-RC16" } ] -} \ No newline at end of file +} From 252386616e75d57ad6ff5c5d885b4c6b069b91be Mon Sep 17 00:00:00 2001 From: TheMeinerLP Date: Fri, 21 Aug 2026 20:12:27 +0200 Subject: [PATCH 2/3] chore(ci): add release-please, PR linting and release SBOMs - pr-lint.yml - commitlint.config.mjs - SBOM job appended to release-please.yml --- .github/workflows/pr-lint.yml | 17 +++++++++++++++++ .github/workflows/release-please.yml | 28 ++++++++++++++++++++++++++++ commitlint.config.mjs | 3 +++ 3 files changed, 48 insertions(+) create mode 100644 .github/workflows/pr-lint.yml create mode 100644 commitlint.config.mjs diff --git a/.github/workflows/pr-lint.yml b/.github/workflows/pr-lint.yml new file mode 100644 index 00000000..759b37b8 --- /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 index 8095d36e..9e1e09a1 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -48,3 +48,31 @@ jobs: bomfilename: "build/reports/cyclonedx/bom.xml" autocreate: true parent: '735737f3-8c00-4123-aa2a-ea6cb62b0b6f' + + 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 + 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/commitlint.config.mjs b/commitlint.config.mjs new file mode 100644 index 00000000..0616fb93 --- /dev/null +++ b/commitlint.config.mjs @@ -0,0 +1,3 @@ +export default { + extends: ['@commitlint/config-conventional'], +}; From 76979b3733e006c9b34f99453d02e14d1bb54a35 Mon Sep 17 00:00:00 2001 From: TheMeinerLP Date: Fri, 21 Aug 2026 21:12:29 +0200 Subject: [PATCH 3/3] fix(ci): restore Renovate platform presets and anchor the version in build.gradle.kts - renovate flavor restored: minestom - extra-files now points at build.gradle.kts --- release-please-config.json | 5 ++++- renovate.json | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/release-please-config.json b/release-please-config.json index 0d47f158..e0787484 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -10,7 +10,10 @@ "package-name": "cygnus", "changelog-path": "CHANGELOG.md", "extra-files": [ - { "type": "generic", "path": "build.gradle.kts" } + { + "type": "generic", + "path": "build.gradle.kts" + } ] } } diff --git a/renovate.json b/renovate.json index ffc94b0f..607db884 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/cygnus-maintainers)" + "github>OneLiteFeatherNET/renovate:default(OneLiteFeatherNET/cygnus-maintainers)", + "github>OneLiteFeatherNET/renovate:minestom" ], "packageRules": [ {