Skip to content

Commit 377e478

Browse files
hyperpolymathclaude
andcommitted
Merge origin/main into fix/glama-license-tables-proof; resolve README conflict
main converged on a Markdown-only README (deleted README.adoc, rewrote README.md — the Glama-crawler-driven clean-Markdown direction); the PR branch had independently kept README.adoc and rewritten README.md. Resolution: - README.adoc: accept main's deletion (Markdown-only is the intended end state). - README.md: take main's newer/fuller rewrite as the canonical body, with two fixes: * malformed licence badge URL `MPL_2.0--3.0--or--later` -> `MPL_2.0` (no such licence; `-or-later` is estate-banned). * header SPDX CC-BY-SA-4.0 -> MPL-2.0 (owner decision) to satisfy this repo's pre-commit hook (still strict MPL-2.0) and match the PR's "MPL-2.0 licensing" purpose. NB: the estate docs=CC-BY-SA split is not yet rolled into boj's hook. OPEN (pending owner notes): main's README.md says "115 cartridges" / no 0.4.7, vs the PR's reconciled 125 / 68 / 0.4.7. Left as main's values — owner to settle. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2 parents 7d9591f + a9384db commit 377e478

5 files changed

Lines changed: 738 additions & 756 deletions

File tree

.github/workflows/build.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# SPDX-License-Identifier: MPL-2.0
2+
# Copyright (c) 2026 Jonathan D.A. Jewell (hyperpolymath) <j.d.a.jewell@open.ac.uk>
3+
#
4+
# SonarQube Cloud (SonarCloud) static analysis. Generated from the SonarCloud
5+
# setup wizard; analysis scope + exclusions live in sonar-project.properties.
6+
# Requires the SONAR_TOKEN repository secret (Settings -> Secrets and variables
7+
# -> Actions). Project: https://sonarcloud.io/project/overview?id=hyperpolymath_boj-server
8+
name: Build
9+
on:
10+
push:
11+
branches:
12+
- main
13+
pull_request:
14+
types: [opened, synchronize, reopened]
15+
permissions:
16+
contents: read
17+
jobs:
18+
sonarqube:
19+
name: SonarQube
20+
runs-on: ubuntu-latest
21+
steps:
22+
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
23+
with:
24+
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
25+
- name: SonarQube Scan
26+
uses: SonarSource/sonarqube-scan-action@7006c4492b2e0ee0f816d36501671557c97f5995 # v8.1.0
27+
env:
28+
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.well-known/security.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
# https://securitytxt.org/
44

55
Contact: mailto:j.d.a.jewell@open.ac.uk
6-
Expires: 2026-12-31T23:59:59.000Z
6+
Expires: 2027-12-31T23:59:59.000Z
77
Preferred-Languages: en
8-
Canonical: https://github.com/hyperpolymath/boj-server/.well-known/security.txt
8+
Canonical: https://boj-server.net/.well-known/security.txt
99
Policy: https://github.com/hyperpolymath/boj-server/blob/main/SECURITY.md
10-
Hiring: https://github.com/hyperpolymath/boj-server/careers

0 commit comments

Comments
 (0)