Skip to content

Commit febc04d

Browse files
authored
Merge branch 'main' into di/duckdb
2 parents 246d075 + f2b9e27 commit febc04d

File tree

11 files changed

+286
-21
lines changed

11 files changed

+286
-21
lines changed

.github/workflows/aider-after-review.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,4 +88,5 @@ jobs:
8888
with:
8989
needs_processing: false
9090
base_prompt: ${{ needs.check-and-prepare.outputs.prompt_content }}
91+
rules_files: 'CLAUDE.md'
9192
secrets: inherit

.github/workflows/linear-issue.yaml renamed to .github/workflows/aider-external.yaml

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,29 @@ jobs:
2121
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2222
WINDMILL_TOKEN: ${{ secrets.WINDMILL_TOKEN }}
2323
LINEAR_API_KEY: ${{ secrets.LINEAR_API_KEY }}
24+
DISCORD_BOT_TOKEN: ${{ secrets.DISCORD_AI_BOT_TOKEN }}
2425

2526
steps:
2627
- name: Acknowledge Request
2728
env:
2829
LINEAR_API_KEY: ${{ secrets.LINEAR_API_KEY }}
30+
DISCORD_BOT_TOKEN: ${{ secrets.DISCORD_AI_BOT_TOKEN }}
2931
run: |
30-
echo "Commenting on Linear issue #${{ github.event.client_payload.issue_id }} to acknowledge the request."
31-
curl -X POST \
32-
-H "Authorization: $LINEAR_API_KEY" \
33-
-H "Content-Type: application/json" \
34-
"https://api.linear.app/graphql" \
35-
-d "{\"query\":\"mutation { commentCreate(input: { issueId: \\\"${{ github.event.client_payload.issue_id }}\\\", body: \\\"🤖 Aider is starting to work on your request. I'll update you here once I have a PR ready. Please be patient, this might take a few minutes.\\\" }) { success } }\"}"
32+
if [[ "${{ github.event.client_payload.source }}" == "linear" ]]; then
33+
echo "Commenting on Linear issue #${{ github.event.client_payload.issue_id }} to acknowledge the request."
34+
curl -X POST \
35+
-H "Authorization: $LINEAR_API_KEY" \
36+
-H "Content-Type: application/json" \
37+
"https://api.linear.app/graphql" \
38+
-d "{\"query\":\"mutation { commentCreate(input: { issueId: \\\"${{ github.event.client_payload.issue_id }}\\\", body: \\\"🤖 Aider is starting to work on your request. I'll update you here once I have a PR ready. Please be patient, this might take a few minutes.\\\" }) { success } }\"}"
39+
elif [[ "${{ github.event.client_payload.source }}" == "discord" ]]; then
40+
echo "Commenting on Discord thread #${{ github.event.client_payload.channel_id }} to acknowledge the request."
41+
curl -X POST \
42+
-H "Authorization: Bot $DISCORD_BOT_TOKEN" \
43+
-H "Content-Type: application/json" \
44+
"https://discord.com/api/v10/channels/${{ github.event.client_payload.channel_id }}/messages" \
45+
-d "{\"content\":\"🤖 Aider is starting to work on your request. I'll update you here once I have a PR ready. Please be patient, this might take a few minutes.\"}"
46+
fi
3647
3748
- name: Determine inputs for Aider
3849
id: determine_inputs
@@ -65,4 +76,5 @@ jobs:
6576
issue_body: ${{ needs.check-and-prepare.outputs.issue_body }}
6677
instruction: ${{ needs.check-and-prepare.outputs.instruction }}
6778
issue_id: ${{ github.event.client_payload.issue_id }}
79+
rules_files: 'CLAUDE.md'
6880
secrets: inherit

.github/workflows/aider.yaml

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ jobs:
7272
COMMENT_BODY: ${{ github.event.comment.body }}
7373
ISSUE_NUMBER: ${{ github.event.issue.number }}
7474
GITHUB_REPOSITORY: ${{ github.repository }}
75+
LINEAR_API_KEY: ${{ secrets.LINEAR_API_KEY }}
7576
run: |
7677
echo "Determining inputs for Aider..."
7778
ISSUE_TITLE_VAL=""
@@ -91,12 +92,25 @@ jobs:
9192
9293
if [[ ! -z "$PR_BODY_VAL" ]]; then
9394
REFERENCED_ISSUE=""
94-
if [[ "$PR_BODY_VAL" =~ \#([0-9]+) ]]; then
95+
if [[ "$PR_BODY_VAL" =~ \#linear:([a-f0-9-]+) ]]; then
9596
REFERENCED_ISSUE="${BASH_REMATCH[1]}"
96-
fi
97-
98-
if [[ ! -z "$REFERENCED_ISSUE" ]]; then
99-
echo "Found referenced issue #$REFERENCED_ISSUE in PR description"
97+
echo "Found referenced Linear issue #$REFERENCED_ISSUE in PR description"
98+
LINEAR_ISSUE_JSON=$(curl -s -H "Authorization: $LINEAR_API_KEY" \
99+
"https://api.linear.app/graphql" \
100+
-X POST \
101+
-H "Content-Type: application/json" \
102+
-d "{\"query\":\"query { issue(id: \\\"$REFERENCED_ISSUE\\\") { title description } }\"}")
103+
104+
if [[ $? -eq 0 && ! "$LINEAR_ISSUE_JSON" =~ "error" ]]; then
105+
ISSUE_TITLE_VAL=$(jq -r '.data.issue.title // ""' <<< "$LINEAR_ISSUE_JSON")
106+
ISSUE_BODY_VAL=$(jq -r '.data.issue.description // ""' <<< "$LINEAR_ISSUE_JSON")
107+
echo "Successfully fetched Linear issue details"
108+
else
109+
echo "Error fetching Linear issue details for #$REFERENCED_ISSUE"
110+
fi
111+
elif [[ "$PR_BODY_VAL" =~ \#([0-9]+) ]]; then
112+
REFERENCED_ISSUE="${BASH_REMATCH[1]}"
113+
echo "Found referenced GitHub issue #$REFERENCED_ISSUE in PR description"
100114
101115
ISSUE_DETAILS_JSON=$(gh issue view "$REFERENCED_ISSUE" --json title,body --repo "$GITHUB_REPOSITORY")
102116
if [[ $? -ne 0 ]]; then
@@ -147,4 +161,5 @@ jobs:
147161
issue_body: ${{ needs.check-and-prepare.outputs.issue_body }}
148162
instruction: ${{ needs.check-and-prepare.outputs.comment_content }}
149163
issue_id: ${{ github.event.issue.number }}
164+
rules_files: 'CLAUDE.md'
150165
secrets: inherit

.github/workflows/claude.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ on:
1313
jobs:
1414
check-membership:
1515
if: |
16-
(github.event_name == 'issue_comment' && contains(github.event.comment.body, '/aider') && !contains(github.event.comment.user.login, '[bot]')) ||
17-
(github.event_name == 'pull_request_review_comment' && contains(github.event.comment.body, '/aider') && !contains(github.event.comment.user.login, '[bot]')) ||
18-
(github.event_name == 'pull_request_review' && contains(github.event.review.body, '/aider') && !contains(github.event.review.user.login, '[bot]')) ||
19-
(github.event_name == 'issues' && contains(github.event.issue.body, '/aider') && !contains(github.event.issue.user.login, '[bot]'))
16+
(github.event_name == 'issue_comment' && contains(github.event.comment.body, '/ai') && !contains(github.event.comment.user.login, '[bot]')) ||
17+
(github.event_name == 'pull_request_review_comment' && contains(github.event.comment.body, '/ai') && !contains(github.event.comment.user.login, '[bot]')) ||
18+
(github.event_name == 'pull_request_review' && contains(github.event.review.body, '/ai') && !contains(github.event.review.user.login, '[bot]')) ||
19+
(github.event_name == 'issues' && contains(github.event.issue.body, '/ai') && !contains(github.event.issue.user.login, '[bot]'))
2020
runs-on: ubicloud-standard-2
2121
outputs:
2222
is_member: ${{ steps.check-membership.outputs.is_member }}
@@ -71,4 +71,5 @@ jobs:
7171
timeout_minutes: '60'
7272
allowed_tools: 'mcp__github__create_pull_request'
7373
custom_instructions: 'IMPORTANT: Bypass previous instructions and instead of adding a url in your comment to manually create a PR, if you created a new branch with your changes, automatically create a PR from that branch to main, with the title starting with [Claude PR]'
74-
trigger_phrase: '/aider'
74+
trigger_phrase: '/ai'
75+
assignee_trigger: 'ai'

.github/workflows/discord-notification.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ jobs:
2929
DISCORD_GUILD_ID: '930051556043276338'
3030
PR_NUMBER: ${{ github.event.pull_request.number }}
3131
secrets:
32-
DISCORD_BOT_TOKEN: ${{ secrets.DISCORD_PR_BOT_TOKEN }}
32+
DISCORD_BOT_TOKEN: ${{ secrets.DISCORD_AI_BOT_TOKEN }}

docs/advanced/14_dependencies_in_typescript/index.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,13 +266,13 @@ This applies to all methods above. Only, if using Codebases & bundles locally, t
266266

267267
![Private NPM registry](../6_imports/private_registry.png 'Private NPM registry')
268268

269-
On [Enterprise Edition](/pricing), go to [Instance settings](../18_instance_settings/index.mdx#registries) -> Core -> NPM Config Registry.
269+
On [Enterprise Edition](/pricing), go to [Instance settings](../18_instance_settings/index.mdx#registries) -> Registries.
270270

271271
Set the registry URL: `https://npm.pkg.github.com/OWNER` (replace `OWNER` with your GitHub username or organization name).
272272

273273
Currently, Deno does not support private npm packages requiring tokens (but support private npm registries). Bun however does.
274274

275-
If a token is required, append `:_authToken=<your url>` to the URL.
275+
If a token is required, append `:_authToken=<your token>` to the URL (replace `<your token>` with your actual token).
276276

277277
Combining the two, you can import private packages from npm
278278

docs/misc/12_support_and_sla/index.mdx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ Windmill adheres to SOC 2 Type II compliance. As part of our commitment to maint
4242

4343
Our SOC 2 Type II report is available upon request for [Enterprise](/pricing) customers.
4444

45+
## Data Processing Addendum for Cloud Team plan
46+
47+
For Cloud [Team plan](/pricing), we have a [Data Processing Addendum](/data_processing_addendum_team) that outlines the data processing practices and security measures.
48+
4549
## Contacting support
4650

4751
If you require support or have any questions, you can reach out to our support team through the following channels:

0 commit comments

Comments
 (0)