Skip to content

Commit 0187875

Browse files
hyperpolymathclaude
andcommitted
chore(license): resolve 0a372d5 PMPL/MPL merge conflicts across 20 files
Parent-repo automation commit 0a372d5 introduced conflict markers in README, MAINTAINERS, TESTING-REPORT, FUNDING, dependabot, and all 13 workflows, all asking PMPL-1.0-or-later vs MPL-2.0-or-later. Resolved by keeping PMPL per License Policy Rule 1 (standard hyperpolymath code). Also fixes a pre-existing YAML syntax bug in workflow-linter.yml lines 57-58 (unindented continuation broke the run:| literal block). Bug was latent: conflict markers made the whole file unparseable, masking it. Unblocks neurophone-mcp cartridge work (AI-WORK-todo §3c gate). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1 parent 2654142 commit 0187875

20 files changed

Lines changed: 3 additions & 88 deletions

.github/FUNDING.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
<<<<<<< HEAD
21
# SPDX-License-Identifier: PMPL-1.0-or-later
3-
=======
4-
# SPDX-License-Identifier: MPL-2.0-or-later
5-
>>>>>>> 0a372d5 (chore: sync from parent repo automation)
62
# Funding platforms for hyperpolymath projects
73
# See: https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/displaying-a-sponsor-button-in-your-repository
84

.github/dependabot.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
<<<<<<< HEAD
21
# SPDX-License-Identifier: PMPL-1.0-or-later
3-
=======
4-
# SPDX-License-Identifier: MPL-2.0-or-later
5-
>>>>>>> 0a372d5 (chore: sync from parent repo automation)
62
version: 2
73
updates:
84
- package-ecosystem: "cargo"

.github/workflows/codeql.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
<<<<<<< HEAD
21
# SPDX-License-Identifier: PMPL-1.0-or-later
3-
=======
4-
# SPDX-License-Identifier: MPL-2.0-or-later
5-
>>>>>>> 0a372d5 (chore: sync from parent repo automation)
62
name: CodeQL Security Analysis
73

84
on:

.github/workflows/guix-nix-policy.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
<<<<<<< HEAD
21
# SPDX-License-Identifier: PMPL-1.0-or-later
3-
=======
4-
# SPDX-License-Identifier: MPL-2.0-or-later
5-
>>>>>>> 0a372d5 (chore: sync from parent repo automation)
62
name: Guix/Nix Package Policy
73
on: [push, pull_request]
84

.github/workflows/instant-sync.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
<<<<<<< HEAD
21
# SPDX-License-Identifier: PMPL-1.0-or-later
3-
=======
4-
# SPDX-License-Identifier: MPL-2.0-or-later
5-
>>>>>>> 0a372d5 (chore: sync from parent repo automation)
62
# Instant Forge Sync - Triggers propagation to all forges on push/release
73
name: Instant Sync
84

.github/workflows/language-policy.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
<<<<<<< HEAD
21
# SPDX-License-Identifier: PMPL-1.0-or-later
32
permissions:
43
contents: read
54

6-
=======
7-
# SPDX-License-Identifier: MPL-2.0-or-later
8-
>>>>>>> 0a372d5 (chore: sync from parent repo automation)
95
name: Language Policy Enforcement
106
on: [push, pull_request]
117
jobs:

.github/workflows/mirror.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
<<<<<<< HEAD
21
# SPDX-License-Identifier: PMPL-1.0-or-later
3-
=======
4-
# SPDX-License-Identifier: MPL-2.0-or-later
5-
>>>>>>> 0a372d5 (chore: sync from parent repo automation)
62
# SPDX-FileCopyrightText: 2025 Jonathan D.A. Jewell
73
name: Mirror to Git Forges
84

.github/workflows/quality.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
<<<<<<< HEAD
21
# SPDX-License-Identifier: PMPL-1.0-or-later
3-
=======
4-
# SPDX-License-Identifier: MPL-2.0-or-later
5-
>>>>>>> 0a372d5 (chore: sync from parent repo automation)
62
name: Code Quality
73
on: [push, pull_request]
84

.github/workflows/rsr-antipattern.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
1-
<<<<<<< HEAD
21
# SPDX-License-Identifier: PMPL-1.0-or-later
32
# RSR Anti-Pattern CI Check
43
# SPDX-License-Identifier: PMPL-1.0-or-later
5-
=======
6-
# SPDX-License-Identifier: MPL-2.0-or-later
7-
# RSR Anti-Pattern CI Check
8-
# SPDX-License-Identifier: MPL-2.0-or-later
9-
>>>>>>> 0a372d5 (chore: sync from parent repo automation)
104
#
115
# Enforces: No TypeScript, No Go, No Python (except SaltStack), No npm
126
# Allows: ReScript, Deno, WASM, Rust, OCaml, Haskell, Guile/Scheme

.github/workflows/rust-ci.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
<<<<<<< HEAD
21
# SPDX-License-Identifier: PMPL-1.0-or-later
3-
=======
4-
# SPDX-License-Identifier: MPL-2.0-or-later
5-
>>>>>>> 0a372d5 (chore: sync from parent repo automation)
62
name: Rust CI
73
on: [push, pull_request]
84

0 commit comments

Comments
 (0)