Skip to content

Commit 2f1edb1

Browse files
authored
Merge branch 'main' into aider-tasks-agentapi-support
2 parents 2e40967 + a9b0150 commit 2f1edb1

File tree

78 files changed

+1661
-690
lines changed

Some content is hidden

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

78 files changed

+1661
-690
lines changed

.github/dependabot.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,7 @@ updates:
44
directory: "/"
55
schedule:
66
interval: "weekly"
7+
groups:
8+
github-actions:
9+
patterns:
10+
- "*"

.github/scripts/version-bump.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,8 @@ main() {
192192

193193
# Always run formatter to ensure consistent formatting
194194
echo "🔧 Running formatter to ensure consistent formatting..."
195-
if command -v bun >/dev/null 2>&1; then
196-
bun fmt >/dev/null 2>&1 || echo "⚠️ Warning: bun fmt failed, but continuing..."
195+
if command -v bun > /dev/null 2>&1; then
196+
bun fmt > /dev/null 2>&1 || echo "⚠️ Warning: bun fmt failed, but continuing..."
197197
else
198198
echo "⚠️ Warning: bun not found, skipping formatting"
199199
fi

.github/typos.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
muc = "muc" # For Munich location code
33
Hashi = "Hashi"
44
HashiCorp = "HashiCorp"
5+
mavrickrishi = "mavrickrishi" # Username
6+
mavrick = "mavrick" # Username
57

68
[files]
79
extend-exclude = ["registry/coder/templates/aws-devcontainer/architecture.svg"] #False positive

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
- name: Validate formatting
4949
run: bun fmt:ci
5050
- name: Check for typos
51-
uses: crate-ci/[email protected].4
51+
uses: crate-ci/[email protected].5
5252
with:
5353
config: .github/typos.toml
5454
validate-readme-files:

.github/workflows/deploy-registry.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
workload_identity_provider: projects/309789351055/locations/global/workloadIdentityPools/github-actions/providers/github
3636
service_account: [email protected]
3737
- name: Set up Google Cloud SDK
38-
uses: google-github-actions/setup-gcloud@cb1e50a9932213ecece00a606661ae9ca44f3397
38+
uses: google-github-actions/setup-gcloud@26f734c2779b00b7dda794207734c511110a4368
3939
- name: Deploy to dev.registry.coder.com
4040
run: gcloud builds triggers run 29818181-126d-4f8a-a937-f228b27d3d34 --branch main
4141
- name: Deploy to registry.coder.com

.github/workflows/golangci-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ jobs:
2121
- name: golangci-lint
2222
uses: golangci/golangci-lint-action@v8
2323
with:
24-
version: v2.1
24+
version: v2.1

.github/workflows/release.yml

Lines changed: 28 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -11,33 +11,33 @@ jobs:
1111
permissions:
1212
contents: write
1313
pull-requests: read
14-
14+
1515
steps:
1616
- name: Checkout code
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v5
1818
with:
1919
fetch-depth: 0
2020
persist-credentials: false
21-
21+
2222
- name: Extract tag information
2323
id: tag_info
2424
run: |
2525
TAG=${GITHUB_REF#refs/tags/}
2626
echo "tag=$TAG" >> $GITHUB_OUTPUT
27-
27+
2828
IFS='/' read -ra PARTS <<< "$TAG"
2929
NAMESPACE="${PARTS[1]}"
3030
MODULE="${PARTS[2]}"
3131
VERSION="${PARTS[3]}"
32-
32+
3333
echo "namespace=$NAMESPACE" >> $GITHUB_OUTPUT
3434
echo "module=$MODULE" >> $GITHUB_OUTPUT
3535
echo "version=$VERSION" >> $GITHUB_OUTPUT
3636
echo "module_path=registry/$NAMESPACE/modules/$MODULE" >> $GITHUB_OUTPUT
37-
37+
3838
RELEASE_TITLE="$NAMESPACE/$MODULE $VERSION"
3939
echo "release_title=$RELEASE_TITLE" >> $GITHUB_OUTPUT
40-
40+
4141
- name: Find previous tag
4242
id: prev_tag
4343
env:
@@ -46,15 +46,15 @@ jobs:
4646
CURRENT_TAG: ${{ steps.tag_info.outputs.tag }}
4747
run: |
4848
PREV_TAG=$(git tag -l "release/$NAMESPACE/$MODULE/v*" | sort -V | grep -B1 "$CURRENT_TAG" | head -1)
49-
49+
5050
if [ -z "$PREV_TAG" ] || [ "$PREV_TAG" = "$CURRENT_TAG" ]; then
5151
echo "No previous tag found, using initial commit"
5252
PREV_TAG=$(git rev-list --max-parents=0 HEAD)
5353
fi
54-
54+
5555
echo "prev_tag=$PREV_TAG" >> $GITHUB_OUTPUT
5656
echo "Previous tag: $PREV_TAG"
57-
57+
5858
- name: Generate changelog
5959
id: changelog
6060
env:
@@ -64,24 +64,29 @@ jobs:
6464
CURRENT_TAG: ${{ steps.tag_info.outputs.tag }}
6565
run: |
6666
echo "Generating changelog for $MODULE_PATH between $PREV_TAG and $CURRENT_TAG"
67-
67+
6868
COMMITS=$(git log --oneline --no-merges "$PREV_TAG..$CURRENT_TAG" -- "$MODULE_PATH")
69-
69+
7070
if [ -z "$COMMITS" ]; then
7171
echo "No commits found for this module"
7272
echo "changelog=No changes found for this module." >> $GITHUB_OUTPUT
7373
exit 0
7474
fi
75-
76-
FULL_CHANGELOG=$(gh api repos/:owner/:repo/releases/generate-notes \
77-
--field tag_name="$CURRENT_TAG" \
78-
--field previous_tag_name="$PREV_TAG" \
79-
--jq '.body')
80-
75+
76+
if [[ "$PREV_TAG" == release/* ]]; then
77+
FULL_CHANGELOG=$(gh api repos/:owner/:repo/releases/generate-notes \
78+
--field tag_name="$CURRENT_TAG" \
79+
--field previous_tag_name="$PREV_TAG" \
80+
--jq '.body')
81+
else
82+
echo "New module detected, skipping GitHub API"
83+
FULL_CHANGELOG=""
84+
fi
85+
8186
MODULE_COMMIT_SHAS=$(git log --format="%H" --no-merges "$PREV_TAG..$CURRENT_TAG" -- "$MODULE_PATH")
82-
87+
8388
FILTERED_CHANGELOG="## What's Changed\n\n"
84-
89+
8590
for sha in $MODULE_COMMIT_SHAS; do
8691
SHORT_SHA=${sha:0:7}
8792
@@ -95,11 +100,11 @@ jobs:
95100
FILTERED_CHANGELOG="${FILTERED_CHANGELOG}* $COMMIT_MSG by @$AUTHOR\n"
96101
fi
97102
done
98-
103+
99104
echo "changelog<<EOF" >> $GITHUB_OUTPUT
100105
echo -e "$FILTERED_CHANGELOG" >> $GITHUB_OUTPUT
101106
echo "EOF" >> $GITHUB_OUTPUT
102-
107+
103108
- name: Create Release
104109
env:
105110
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -109,4 +114,4 @@ jobs:
109114
run: |
110115
gh release create "$TAG_NAME" \
111116
--title "$RELEASE_TITLE" \
112-
--notes "$CHANGELOG"
117+
--notes "$CHANGELOG"

.golangci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@ linters:
163163
staticcheck:
164164
checks:
165165
- all
166-
- SA4006 # Detects redundant assignments
167-
- SA4009 # Detects redundant variable declarations
166+
- SA4006 # Detects redundant assignments
167+
- SA4009 # Detects redundant variable declarations
168168
- SA1019
169169
exclusions:
170170
generated: lax

.prettierignore

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Ignore symlinks to avoid Prettier errors
2+
CLAUDE.md
3+
.github/copilot-instructions.md
4+
5+
# Ignore node_modules and dependencies
6+
node_modules/
7+
8+
# Ignore Terraform files (formatted by terraform fmt)
9+
*.tf
10+
*.hcl
11+
*.tfvars
12+
13+
# Ignore generated and temporary files
14+
.terraform/
15+
*.tfstate
16+
*.tfstate.backup
17+
*.tfstate.lock.info
18+
19+
# Ignore other files that shouldn't be formatted
20+
bun.lock
21+
go.sum
22+
go.mod

bun.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"": {
55
"name": "registry",
66
"devDependencies": {
7-
"@types/bun": "^1.2.18",
8-
"bun-types": "^1.2.18",
7+
"@types/bun": "^1.2.21",
8+
"bun-types": "^1.2.21",
99
"dedent": "^1.6.0",
1010
"gray-matter": "^4.0.3",
11-
"marked": "^16.0.0",
11+
"marked": "^16.2.0",
1212
"prettier": "^3.6.2",
1313
"prettier-plugin-sh": "^0.18.0",
1414
"prettier-plugin-terraform-formatter": "^1.2.1",
@@ -21,15 +21,15 @@
2121
"packages": {
2222
"@reteps/dockerfmt": ["@reteps/[email protected]", "", {}, "sha512-Tb5wIMvBf/nLejTQ61krK644/CEMB/cpiaIFXqGApfGqO3GwcR3qnI0DbmkFVCl2OyEp8LnLX3EkucoL0+tbFg=="],
2323

24-
"@types/bun": ["@types/[email protected].18", "", { "dependencies": { "bun-types": "1.2.18" } }, "sha512-Xf6RaWVheyemaThV0kUfaAUvCNokFr+bH8Jxp+tTZfx7dAPA8z9ePnP9S9+Vspzuxxx9JRAXhnyccRj3GyCMdQ=="],
24+
"@types/bun": ["@types/[email protected].21", "", { "dependencies": { "bun-types": "1.2.21" } }, "sha512-NiDnvEqmbfQ6dmZ3EeUO577s4P5bf4HCTXtI6trMc6f6RzirY5IrF3aIookuSpyslFzrnvv2lmEWv5HyC1X79A=="],
2525

2626
"@types/node": ["@types/[email protected]", "", { "dependencies": { "undici-types": "~7.8.0" } }, "sha512-4zXMWD91vBLGRtHK3YbIoFMia+1nqEz72coM42C5ETjnNCa/heoj7NT1G67iAfOqMmcfhuCZ4uNpyz8EjlAejw=="],
2727

2828
"@types/react": ["@types/[email protected]", "", { "dependencies": { "csstype": "^3.0.2" } }, "sha512-AwAfQ2Wa5bCx9WP8nZL2uMZWod7J7/JSplxbTmBQ5ms6QpqNYm672H0Vu9ZVKVngQ+ii4R/byguVEUZQyeg44g=="],
2929

3030
"argparse": ["[email protected]", "", { "dependencies": { "sprintf-js": "~1.0.2" } }, "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="],
3131

32-
"bun-types": ["[email protected].18", "", { "dependencies": { "@types/node": "*" }, "peerDependencies": { "@types/react": "^19" } }, "sha512-04+Eha5NP7Z0A9YgDAzMk5PHR16ZuLVa83b26kH5+cp1qZW4F6FmAURngE7INf4tKOvCE69vYvDEwoNl1tGiWw=="],
32+
"bun-types": ["[email protected].21", "", { "dependencies": { "@types/node": "*" }, "peerDependencies": { "@types/react": "^19" } }, "sha512-sa2Tj77Ijc/NTLS0/Odjq/qngmEPZfbfnOERi0KRUYhT9R8M4VBioWVmMWE5GrYbKMc+5lVybXygLdibHaqVqw=="],
3333

3434
"csstype": ["[email protected]", "", {}, "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="],
3535

@@ -47,7 +47,7 @@
4747

4848
"kind-of": ["[email protected]", "", {}, "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="],
4949

50-
"marked": ["marked@16.0.0", "", { "bin": { "marked": "bin/marked.js" } }, "sha512-MUKMXDjsD/eptB7GPzxo4xcnLS6oo7/RHimUMHEDRhUooPwmN9BEpMl7AEOJv3bmso169wHI2wUF9VQgL7zfmA=="],
50+
"marked": ["marked@16.2.0", "", { "bin": { "marked": "bin/marked.js" } }, "sha512-LbbTuye+0dWRz2TS9KJ7wsnD4KAtpj0MVkWc90XvBa6AslXsT0hTBVH5k32pcSyHH1fst9XEFJunXHktVy0zlg=="],
5151

5252
"prettier": ["[email protected]", "", { "bin": { "prettier": "bin/prettier.cjs" } }, "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ=="],
5353

0 commit comments

Comments
 (0)