Skip to content

Commit 006a157

Browse files
hyperpolymathclaude
andcommitted
merge(main): resolve conflict in fix-script-registry.json (combine both additions)
Both sides added independent JSON entries: HEAD added reusable_workflow_sha_bump_needs_propagation (PR #249 actuation), main added 5 chapel/codeql cron fix-script entries. Resolution: keep all 6 entries (textual merge, no semantic interaction). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2 parents 25c4013 + bcbe886 commit 006a157

158 files changed

Lines changed: 478 additions & 154 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.dockerignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-License-Identifier: PMPL-1.0-or-later
1+
# SPDX-License-Identifier: MPL-2.0
22

33
# Git
44
.git

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-License-Identifier: PMPL-1.0-or-later
1+
# SPDX-License-Identifier: MPL-2.0
22
# RSR-compliant .gitattributes
33
* text=auto eol=lf
44
# Source

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-License-Identifier: PMPL-1.0-or-later
1+
# SPDX-License-Identifier: MPL-2.0
22
# SPDX-FileCopyrightText: 2026 Jonathan D.A. Jewell (hyperpolymath)
33
#
44
# Solo-maintained hyperpolymath repo: no owner lines by policy.

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# RSR-compliant .gitignore
2-
# SPDX-License-Identifier: PMPL-1.0-or-later
2+
# SPDX-License-Identifier: MPL-2.0
33
# SPDX-FileCopyrightText: 2025 hyperpolymath
44

55
# Build artifacts

.hypatia-ignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-License-Identifier: PMPL-1.0-or-later
1+
# SPDX-License-Identifier: MPL-2.0
22
# .hypatia-ignore - Exemptions for banned language files (ReScript)
33
# These ReScript files in bots/sustainabot are legacy and approved for use
44
# in the sustainabot integration. See robot-repo-automaton for the migration path.

.machine_readable/ADJUST.contractile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
; SPDX-License-Identifier: PMPL-1.0-or-later
1+
; SPDX-License-Identifier: MPL-2.0
22
; ADJUST.contractile — Accessibility invariants for gitbot-fleet
33
; "ADJUST" = Accessibility & Digital Justice for Universal Software & Technology
44
;

.machine_readable/AGENTIC.a2ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-License-Identifier: PMPL-1.0-or-later
1+
# SPDX-License-Identifier: MPL-2.0
22
# Copyright (c) 2026 Jonathan D.A. Jewell (hyperpolymath) <j.d.a.jewell@open.ac.uk>
33
#
44
# AGENTIC.a2ml — AI agent constraints and capabilities

.machine_readable/CICD-PATTERNS.a2ml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
;; SPDX-License-Identifier: PMPL-1.0-or-later
1+
;; SPDX-License-Identifier: MPL-2.0
22
;; SPDX-FileCopyrightText: 2025-2026 hyperpolymath
33
;; CICD-PATTERNS.a2ml - CI/CD error patterns and fixes for bot learning
44
;; Media-Type: application/cicd-patterns+scheme
@@ -91,7 +91,7 @@ version = "1.0"
9191
(severity "low")
9292
(pattern "^name:")
9393
(description "Workflow file missing SPDX license header")
94-
(fix "Add '# SPDX-License-Identifier: PMPL-1.0-or-later' as first line")
94+
(fix "Add '# SPDX-License-Identifier: MPL-2.0' as first line")
9595
(auto-fixable #t))
9696

9797
(workflow-linter-self-detection
@@ -243,7 +243,7 @@ version = "1.0"
243243
(sha-pin-format
244244
"Format: uses: action/name@SHA # version")
245245
(spdx-header
246-
"First line: # SPDX-License-Identifier: PMPL-1.0-or-later")
246+
"First line: # SPDX-License-Identifier: MPL-2.0")
247247
(rust-toolchain-fix
248248
"uses: dtolnay/rust-toolchain@SHA\\n with:\\n toolchain: stable"))
249249

.machine_readable/CLADE.a2ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-License-Identifier: PMPL-1.0-or-later
1+
# SPDX-License-Identifier: MPL-2.0
22
# Clade declaration — part of the gv-clade-index registry
33
# See: https://github.com/hyperpolymath/gv-clade-index
44

.machine_readable/ECOSYSTEM.a2ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-License-Identifier: PMPL-1.0-or-later
1+
# SPDX-License-Identifier: MPL-2.0
22
# Copyright (c) 2026 Jonathan D.A. Jewell (hyperpolymath) <j.d.a.jewell@open.ac.uk>
33
#
44
# ECOSYSTEM.a2ml — Gitbot Fleet ecosystem position

0 commit comments

Comments
 (0)