Skip to content

Commit 4c21ce7

Browse files
DanielleMaywoodDanielleMaywood
committed
Merge branch 'main' into dm-internal-247
2 parents a9c8676 + a15f06a commit 4c21ce7

File tree

382 files changed

+14612
-9316
lines changed

Some content is hidden

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

382 files changed

+14612
-9316
lines changed

‎.dockerignore

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

‎.github/ISSUE_TEMPLATE/1-bug.yaml

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
name: "🐞 Bug"
2+
description: "File a bug report."
3+
title: "<title>"
4+
labels: ["needs-triage"]
5+
body:
6+
- type: checkboxes
7+
id: existing_issues
8+
attributes:
9+
label: "Is there an existing issue for this?"
10+
description: "Please search to see if an issue already exists for the bug you encountered."
11+
options:
12+
- label: "I have searched the existing issues"
13+
required: true
14+
15+
- type: textarea
16+
id: issue
17+
attributes:
18+
label: "Current Behavior"
19+
description: "A concise description of what you're experiencing."
20+
placeholder: "Tell us what you see!"
21+
validations:
22+
required: false
23+
24+
- type: textarea
25+
id: logs
26+
attributes:
27+
label: "Relevant Log Output"
28+
description: "Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks."
29+
render: shell
30+
31+
- type: textarea
32+
id: expected
33+
attributes:
34+
label: "Expected Behavior"
35+
description: "A concise description of what you expected to happen."
36+
validations:
37+
required: false
38+
39+
- type: textarea
40+
id: steps_to_reproduce
41+
attributes:
42+
label: "Steps to Reproduce"
43+
description: "Provide step-by-step instructions to reproduce the issue."
44+
placeholder: |
45+
1. First step
46+
2. Second step
47+
3. Another step
48+
4. Issue occurs
49+
validations:
50+
required: true
51+
52+
- type: textarea
53+
id: environment
54+
attributes:
55+
label: "Environment"
56+
description: |
57+
Provide details about your environment:
58+
- **Host OS**: (e.g., Ubuntu 24.04, Debian 12)
59+
- **Coder Version**: (e.g., v2.18.4)
60+
placeholder: |
61+
Run `coder version` to get Coder version
62+
value: |
63+
- Host OS:
64+
- Coder version:
65+
validations:
66+
required: false
67+
68+
- type: dropdown
69+
id: additional_info
70+
attributes:
71+
label: "Additional Context"
72+
description: "Select any applicable options:"
73+
multiple: true
74+
options:
75+
- "The issue occurs consistently"
76+
- "The issue is new (previously worked fine)"
77+
- "The issue happens on multiple deployments"
78+
- "I have tested this on the latest version"

‎.github/ISSUE_TEMPLATE/config.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
contact_links:
2+
- name: Questions, suggestion or feature requests?
3+
url: https://github.com/coder/coder/discussions/new/choose
4+
about: Our preferred starting point if you have any questions or suggestions about configuration, features or unexpected behavior.
5+
- name: Coder Docs
6+
url: https://coder.com/docs
7+
about: Check our docs.
8+
- name: Coder Discord Community
9+
url: https://discord.gg/coder
10+
about: Get in touch with the Coder developers and community for support.

‎.github/actions/setup-sqlc/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ runs:
77
- name: Setup sqlc
88
uses: sqlc-dev/setup-sqlc@c0209b9199cd1cce6a14fc27cabcec491b651761 # v4.0.0
99
with:
10-
sqlc-version: "1.25.0"
10+
sqlc-version: "1.27.0"

‎.github/workflows/ci.yaml

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ jobs:
188188
189189
# Check for any typos
190190
- name: Check for typos
191-
uses: crate-ci/typos@685eb3d55be2f85191e8c84acb9f44d7756f84ab # v1.29.4
191+
uses: crate-ci/typos@11ca4583f2f3f74c7e7785c0ecb20fe2c99a4308 # v1.29.5
192192
with:
193193
config: .github/workflows/typos.toml
194194

@@ -251,16 +251,16 @@ jobs:
251251
- name: go install tools
252252
run: |
253253
go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.30
254-
go install storj.io/drpc/cmd/protoc-gen-go-drpc@v0.0.33
254+
go install storj.io/drpc/cmd/protoc-gen-go-drpc@v0.0.34
255255
go install golang.org/x/tools/cmd/goimports@latest
256-
go install github.com/mikefarah/yq/v4@v4.30.6
257-
go install go.uber.org/mock/mockgen@v0.4.0
256+
go install github.com/mikefarah/yq/v4@v4.44.3
257+
go install go.uber.org/mock/mockgen@v0.5.0
258258
259259
- name: Install Protoc
260260
run: |
261261
mkdir -p /tmp/proto
262262
pushd /tmp/proto
263-
curl -L -o protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v23.3/protoc-23.3-linux-x86_64.zip
263+
curl -L -o protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v23.4/protoc-23.4-linux-x86_64.zip
264264
unzip protoc.zip
265265
cp -r ./bin/* /usr/local/bin
266266
cp -r ./include /usr/local/bin/include
@@ -704,6 +704,9 @@ jobs:
704704
- run: make gen/mark-fresh
705705
name: make gen
706706

707+
- run: make site/e2e/bin/coder
708+
name: make coder
709+
707710
- run: pnpm build
708711
env:
709712
NODE_OPTIONS: ${{ github.repository_owner == 'coder' && '--max_old_space_size=8192' || '' }}
@@ -847,7 +850,7 @@ jobs:
847850
run: |
848851
mkdir -p /tmp/proto
849852
pushd /tmp/proto
850-
curl -L -o protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v23.3/protoc-23.3-linux-x86_64.zip
853+
curl -L -o protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v23.4/protoc-23.4-linux-x86_64.zip
851854
unzip protoc.zip
852855
cp -r ./bin/* /usr/local/bin
853856
cp -r ./include /usr/local/bin/include
@@ -859,10 +862,10 @@ jobs:
859862
- name: Install go tools
860863
run: |
861864
go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.30
862-
go install storj.io/drpc/cmd/protoc-gen-go-drpc@v0.0.33
865+
go install storj.io/drpc/cmd/protoc-gen-go-drpc@v0.0.34
863866
go install golang.org/x/tools/cmd/goimports@latest
864-
go install github.com/mikefarah/yq/v4@v4.30.6
865-
go install go.uber.org/mock/mockgen@v0.4.0
867+
go install github.com/mikefarah/yq/v4@v4.44.3
868+
go install go.uber.org/mock/mockgen@v0.5.0
866869
867870
- name: Setup sqlc
868871
uses: ./.github/actions/setup-sqlc
@@ -1170,13 +1173,13 @@ jobs:
11701173
fetch-depth: 0
11711174

11721175
- name: Authenticate to Google Cloud
1173-
uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2.1.7
1176+
uses: google-github-actions/auth@71f986410dfbc7added4569d411d040a91dc6935 # v2.1.8
11741177
with:
11751178
workload_identity_provider: projects/573722524737/locations/global/workloadIdentityPools/github/providers/github
11761179
service_account: coder-ci@coder-dogfood.iam.gserviceaccount.com
11771180

11781181
- name: Set up Google Cloud SDK
1179-
uses: google-github-actions/setup-gcloud@6189d56e4096ee891640bb02ac264be376592d6a # v2.1.2
1182+
uses: google-github-actions/setup-gcloud@77e7a554d41e2ee56fc945c52dfd3f33d12def9a # v2.1.4
11801183

11811184
- name: Set up Flux CLI
11821185
uses: fluxcd/flux2/action@5350425cdcd5fa015337e09fa502153c0275bd4b # v2.4.0
@@ -1185,7 +1188,7 @@ jobs:
11851188
version: "2.2.1"
11861189

11871190
- name: Get Cluster Credentials
1188-
uses: google-github-actions/get-gke-credentials@9025e8f90f2d8e0c3dafc3128cc705a26d992a6a # v2.3.0
1191+
uses: google-github-actions/get-gke-credentials@7a108e64ed8546fe38316b4086e91da13f4785e1 # v2.3.1
11891192
with:
11901193
cluster_name: dogfood-v2
11911194
location: us-central1-a

‎.github/workflows/contrib.yaml

Lines changed: 6 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@ name: contrib
22

33
on:
44
issue_comment:
5-
types: [created]
6-
pull_request:
5+
types: [created, edited]
6+
pull_request_target:
77
types:
88
- opened
99
- closed
1010
- synchronize
1111
- labeled
1212
- unlabeled
13-
- opened
1413
- reopened
1514
- edited
1615
# For jobs that don't run on draft PRs.
@@ -23,88 +22,13 @@ permissions:
2322
concurrency: pr-${{ github.ref }}
2423

2524
jobs:
26-
# Dependabot is annoying, but this makes it a bit less so.
27-
dependabot-automerge:
28-
runs-on: ubuntu-latest
29-
if: github.event_name == 'pull_request' && github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'coder/coder'
30-
permissions:
31-
pull-requests: write
32-
steps:
33-
- name: Dependabot metadata
34-
id: metadata
35-
uses: dependabot/fetch-metadata@dbb049abf0d677abbd7f7eee0375145b417fdd34 # v2.2.0
36-
with:
37-
github-token: "${{ secrets.GITHUB_TOKEN }}"
38-
39-
- name: Approve the PR
40-
run: gh pr review --approve "$PR_URL"
41-
env:
42-
PR_URL: ${{github.event.pull_request.html_url}}
43-
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
44-
45-
- name: Enable auto-merge for Dependabot PRs
46-
if: steps.metadata.outputs.update-type == 'version-update:semver-patch'
47-
run: gh pr merge --auto --merge "$PR_URL"
48-
env:
49-
PR_URL: ${{github.event.pull_request.html_url}}
50-
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
51-
52-
dependabot-automerge-notify:
53-
# Send a slack notification when a dependabot PR is merged.
54-
runs-on: ubuntu-latest
55-
if: github.event_name == 'pull_request' && github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'coder/coder' && github.event.pull_request.merged
56-
steps:
57-
- name: Send Slack notification
58-
env:
59-
PR_URL: ${{github.event.pull_request.html_url}}
60-
PR_TITLE: ${{github.event.pull_request.title}}
61-
PR_NUMBER: ${{github.event.pull_request.number}}
62-
run: |
63-
curl -X POST -H 'Content-type: application/json' \
64-
--data '{
65-
"username": "dependabot",
66-
"icon_url": "https://avatars.githubusercontent.com/u/27347476",
67-
"blocks": [
68-
{
69-
"type": "header",
70-
"text": {
71-
"type": "plain_text",
72-
"text": ":pr-merged: Auto merged Dependabot PR #${{ env.PR_NUMBER }}",
73-
"emoji": true
74-
}
75-
},
76-
{
77-
"type": "section",
78-
"fields": [
79-
{
80-
"type": "mrkdwn",
81-
"text": "${{ env.PR_TITLE }}"
82-
}
83-
]
84-
},
85-
{
86-
"type": "actions",
87-
"elements": [
88-
{
89-
"type": "button",
90-
"text": {
91-
"type": "plain_text",
92-
"text": "View PR"
93-
},
94-
"url": "${{ env.PR_URL }}"
95-
}
96-
]
97-
}
98-
]
99-
}' ${{ secrets.DEPENDABOT_PRS_SLACK_WEBHOOK }}
100-
10125
cla:
10226
runs-on: ubuntu-latest
10327
permissions:
10428
pull-requests: write
10529
steps:
10630
- name: cla
107-
if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request'
31+
if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
10832
uses: contributor-assistant/github-action@ca4a40a7d1004f18d9960b404b97e5f30a505a08 # v2.6.1
10933
env:
11034
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -122,8 +46,10 @@ jobs:
12246

12347
release-labels:
12448
runs-on: ubuntu-latest
49+
permissions:
50+
pull-requests: write
12551
# Skip tagging for draft PRs.
126-
if: ${{ github.event_name == 'pull_request' && !github.event.pull_request.draft }}
52+
if: ${{ github.event_name == 'pull_request_target' && !github.event.pull_request.draft }}
12753
steps:
12854
- name: release-labels
12955
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1

‎.github/workflows/dependabot.yaml

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
name: dependabot
2+
3+
on:
4+
pull_request:
5+
types:
6+
- opened
7+
8+
permissions:
9+
contents: read
10+
11+
jobs:
12+
dependabot-automerge:
13+
runs-on: ubuntu-latest
14+
if: >
15+
github.event_name == 'pull_request' &&
16+
github.event.action == 'opened' &&
17+
github.event.pull_request.user.login == 'dependabot[bot]' &&
18+
github.actor_id == 49699333 &&
19+
github.repository == 'coder/coder'
20+
permissions:
21+
pull-requests: write
22+
contents: write
23+
steps:
24+
- name: Dependabot metadata
25+
id: metadata
26+
uses: dependabot/fetch-metadata@d7267f607e9d3fb96fc2fbe83e0af444713e90b7 # v2.3.0
27+
with:
28+
github-token: "${{ secrets.GITHUB_TOKEN }}"
29+
30+
- name: Approve the PR
31+
run: |
32+
echo "Approving $PR_URL"
33+
gh pr review --approve "$PR_URL"
34+
env:
35+
PR_URL: ${{github.event.pull_request.html_url}}
36+
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
37+
38+
- name: Enable auto-merge
39+
run: |
40+
echo "Enabling auto-merge for $PR_URL"
41+
gh pr merge --auto --squash "$PR_URL"
42+
env:
43+
PR_URL: ${{github.event.pull_request.html_url}}
44+
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
45+
46+
- name: Send Slack notification
47+
env:
48+
PR_URL: ${{github.event.pull_request.html_url}}
49+
PR_TITLE: ${{github.event.pull_request.title}}
50+
PR_NUMBER: ${{github.event.pull_request.number}}
51+
run: |
52+
curl -X POST -H 'Content-type: application/json' \
53+
--data '{
54+
"username": "dependabot",
55+
"icon_url": "https://avatars.githubusercontent.com/u/27347476",
56+
"blocks": [
57+
{
58+
"type": "header",
59+
"text": {
60+
"type": "plain_text",
61+
"text": ":pr-merged: Auto merge enabled for Dependabot PR #${{ env.PR_NUMBER }}",
62+
"emoji": true
63+
}
64+
},
65+
{
66+
"type": "section",
67+
"fields": [
68+
{
69+
"type": "mrkdwn",
70+
"text": "${{ env.PR_TITLE }}"
71+
}
72+
]
73+
},
74+
{
75+
"type": "actions",
76+
"elements": [
77+
{
78+
"type": "button",
79+
"text": {
80+
"type": "plain_text",
81+
"text": "View PR"
82+
},
83+
"url": "${{ env.PR_URL }}"
84+
}
85+
]
86+
}
87+
]
88+
}' ${{ secrets.DEPENDABOT_PRS_SLACK_WEBHOOK }}

0 commit comments

Comments
 (0)