Skip to content

Commit 1e199f3

Browse files
hyperpolymathclaude
andcommitted
Merge origin/main into proofs/q5-propositional-equiv-restructure
Resolves 17 conflicts. Main wins all 16 workflow files (PR #153-#155 hardening supersedes this branch's CI edits: valid pins, job-level timeouts, pruned CodeQL languages, provers already landed via main). Branch keeps the contractiles restructure incl. deletion of the old contractiles/ tree. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2 parents a1338bd + 566d73e commit 1e199f3

201 files changed

Lines changed: 1923 additions & 873 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.

.claude/CLAUDE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
SPDX-License-Identifier: MPL-2.0
2+
SPDX-License-Identifier: CC-BY-SA-4.0
33
Copyright (c) Jonathan D.A. Jewell <j.d.a.jewell@open.ac.uk>
44
-->
55
## Canonical bridge — READ FIRST

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 0 additions & 38 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/custom.md

Lines changed: 0 additions & 10 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/documentation.md

Lines changed: 0 additions & 70 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 0 additions & 20 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/question.md

Lines changed: 0 additions & 59 deletions
This file was deleted.

.github/PROVEN-INTEGRATION.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
SPDX-License-Identifier: MPL-2.0
2+
SPDX-License-Identifier: CC-BY-SA-4.0
33
Copyright (c) Jonathan D.A. Jewell <j.d.a.jewell@open.ac.uk>
44
-->
55
# proven Integration Plan

.github/workflows/boj-build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ on:
88
jobs:
99
trigger-boj:
1010
runs-on: ubuntu-latest
11+
timeout-minutes: 30
1112
steps:
1213
- name: Checkout
13-
uses: actions/checkout@1cce3390c2bfda521930d01229c073c7ff920824 # v6.0.2
14+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v6.0.2
1415
- name: Trigger BoJ Server (Casket/ssg-mcp)
1516
run: |
1617
# Send a secure trigger to boj-server to build this repository

.github/workflows/bridge-forbidden-phrases.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ jobs:
3030
check:
3131
name: docs/ECHO-TYPES-OCHRANCE-BRIDGE forbidden-phrases
3232
runs-on: ubuntu-latest
33+
timeout-minutes: 15
3334
steps:
34-
- uses: actions/checkout@1cce3390c2bfda521930d01229c073c7ff920824 # v4
35+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v4
3536
- name: Run forbidden-phrases checker
3637
run: bash .github/scripts/check-bridge-forbidden-phrases.sh

.github/workflows/casket-pages.yml

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,53 @@
11
# SPDX-License-Identifier: MPL-2.0
22
name: GitHub Pages
3-
timeout-minutes: 30
3+
44
on:
55
push:
66
branches: [main]
77
workflow_dispatch:
8+
89
permissions:
910
contents: read
1011
pages: write
1112
id-token: write
13+
1214
concurrency:
1315
group: "pages"
1416
cancel-in-progress: false
17+
1518
jobs:
1619
build:
1720
runs-on: ubuntu-latest
21+
timeout-minutes: 30
1822
steps:
1923
- name: Checkout
20-
uses: actions/checkout@1cce3390c2bfda521930d01229c073c7ff920824 # v4
24+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v4
25+
2126
- name: Checkout casket-ssg
22-
uses: actions/checkout@1cce3390c2bfda521930d01229c073c7ff920824 # v4
27+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v4
2328
with:
2429
repository: hyperpolymath/casket-ssg
2530
path: .casket-ssg
31+
2632
- name: Setup GHCup
27-
uses: haskell-actions/setup@f9150cb1d140e9a9271700670baa38991e6fa25c # v2
33+
uses: haskell-actions/setup@cd0d9bdd65b20557f41bea4dbe43d0b5fbbfe553 # v2
2834
with:
2935
ghc-version: '9.8.2'
3036
cabal-version: '3.10'
37+
3138
- name: Cache Cabal
32-
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v4
39+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v4
3340
with:
3441
path: |
3542
~/.cabal/packages
3643
~/.cabal/store
3744
.casket-ssg/dist-newstyle
3845
key: ${{ runner.os }}-casket-${{ hashFiles('.casket-ssg/casket-ssg.cabal') }}
46+
3947
- name: Build casket-ssg
4048
working-directory: .casket-ssg
4149
run: cabal build
50+
4251
- name: Build site
4352
run: |
4453
mkdir -p site _site
@@ -69,17 +78,21 @@ jobs:
6978
fi
7079
fi
7180
cd .casket-ssg && cabal run casket-ssg -- build ../site ../_site
81+
7282
- name: Setup Pages
7383
uses: actions/configure-pages@45bfe0192ca1faeb007ade9deae92b16b8254a0d # v6.0.0
84+
7485
- name: Upload artifact
75-
uses: actions/upload-pages-artifact@7b1f4a764d45c48632c6b24a0339c27f5614fb0b # v4.0.0
86+
uses: actions/upload-pages-artifact@fc324d3547104276b827a68afc52ff2a11cc49c9 # v5.0.0
7687
with:
7788
path: '_site'
89+
7890
deploy:
7991
environment:
8092
name: github-pages
8193
url: ${{ steps.deployment.outputs.page_url }}
8294
runs-on: ubuntu-latest
95+
timeout-minutes: 15
8396
needs: build
8497
steps:
8598
- name: Deploy to GitHub Pages

0 commit comments

Comments
 (0)