Skip to content

Commit 9c9b248

Browse files
committed
Merge upstream/main and resolve catalog conflict
2 parents b4be5f5 + 94ba857 commit 9c9b248

10 files changed

Lines changed: 1295 additions & 111 deletions

File tree

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
docfx docfx.json
4848
4949
- name: Setup Pages
50-
uses: actions/configure-pages@v5
50+
uses: actions/configure-pages@v6
5151

5252
- name: Upload artifact
5353
uses: actions/upload-pages-artifact@v3

.github/workflows/stale.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
workflow_dispatch: # Allow manual triggering
77

88
permissions:
9+
actions: write
910
issues: write
1011
pull-requests: write
1112

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
uses: actions/checkout@v4
1717

1818
- name: Install uv
19-
uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7
19+
uses: astral-sh/setup-uv@cec208311dfd045dd5311c1add060b2062131d57 # v8.0.0
2020

2121
- name: Set up Python
2222
uses: actions/setup-python@v6
@@ -36,7 +36,7 @@ jobs:
3636
uses: actions/checkout@v4
3737

3838
- name: Install uv
39-
uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7
39+
uses: astral-sh/setup-uv@cec208311dfd045dd5311c1add060b2062131d57 # v8.0.0
4040

4141
- name: Set up Python ${{ matrix.python-version }}
4242
uses: actions/setup-python@v6

extensions/catalog.community.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"schema_version": "1.0",
3-
"updated_at": "2026-04-03T04:15:00Z",
3+
"updated_at": "2026-04-03T12:35:01Z",
44
"catalog_url": "https://raw.githubusercontent.com/github/spec-kit/main/extensions/catalog.community.json",
55
"extensions": {
66
"aide": {
@@ -172,8 +172,8 @@
172172
"id": "conduct",
173173
"description": "Executes a single spec-kit phase via sub-agent delegation to reduce context pollution.",
174174
"author": "twbrandon7",
175-
"version": "1.0.0",
176-
"download_url": "https://github.com/twbrandon7/spec-kit-conduct-ext/archive/refs/tags/v1.0.0.zip",
175+
"version": "1.0.1",
176+
"download_url": "https://github.com/twbrandon7/spec-kit-conduct-ext/archive/refs/tags/v1.0.1.zip",
177177
"repository": "https://github.com/twbrandon7/spec-kit-conduct-ext",
178178
"homepage": "https://github.com/twbrandon7/spec-kit-conduct-ext",
179179
"documentation": "https://github.com/twbrandon7/spec-kit-conduct-ext/blob/main/README.md",
@@ -195,7 +195,7 @@
195195
"downloads": 0,
196196
"stars": 0,
197197
"created_at": "2026-03-19T12:08:20Z",
198-
"updated_at": "2026-03-19T12:08:20Z"
198+
"updated_at": "2026-04-03T12:35:01Z"
199199
},
200200
"critique": {
201201
"name": "Spec Critique Extension",

pyproject.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@ dependencies = [
77
"typer",
88
"click>=8.1",
99
"rich",
10-
"httpx[socks]",
1110
"platformdirs",
1211
"readchar",
13-
"truststore>=0.10.4",
1412
"pyyaml>=6.0",
1513
"packaging>=23.0",
1614
"pathspec>=0.12.0",

0 commit comments

Comments
 (0)