Skip to content

Commit a5f44aa

Browse files
defelmnqdefelmnq
committed
merge
2 parents 25aedf0 + b77b543 commit a5f44aa

File tree

255 files changed

+9097
-6082
lines changed

Some content is hidden

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

255 files changed

+9097
-6082
lines changed

‎.dockerignore

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

‎.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: 33 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
tailnet-integration: ${{ steps.filter.outputs.tailnet-integration }}
3535
steps:
3636
- name: Harden Runner
37-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
37+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
3838
with:
3939
egress-policy: audit
4040

@@ -155,7 +155,7 @@ jobs:
155155
runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-8' || 'ubuntu-latest' }}
156156
steps:
157157
- name: Harden Runner
158-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
158+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
159159
with:
160160
egress-policy: audit
161161

@@ -188,7 +188,7 @@ jobs:
188188
189189
# Check for any typos
190190
- name: Check for typos
191-
uses: crate-ci/typos@d1c850b2b5d502763520c25fb4a6a1128ad99bd9 # v1.28.3
191+
uses: crate-ci/typos@685eb3d55be2f85191e8c84acb9f44d7756f84ab # v1.29.4
192192
with:
193193
config: .github/workflows/typos.toml
194194

@@ -227,7 +227,7 @@ jobs:
227227
if: always()
228228
steps:
229229
- name: Harden Runner
230-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
230+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
231231
with:
232232
egress-policy: audit
233233

@@ -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
@@ -290,7 +290,7 @@ jobs:
290290
timeout-minutes: 7
291291
steps:
292292
- name: Harden Runner
293-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
293+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
294294
with:
295295
egress-policy: audit
296296

@@ -331,7 +331,7 @@ jobs:
331331
- windows-2022
332332
steps:
333333
- name: Harden Runner
334-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
334+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
335335
with:
336336
egress-policy: audit
337337

@@ -391,7 +391,7 @@ jobs:
391391
- windows-2022
392392
steps:
393393
- name: Harden Runner
394-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
394+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
395395
with:
396396
egress-policy: audit
397397

@@ -447,7 +447,7 @@ jobs:
447447
- ubuntu-latest
448448
steps:
449449
- name: Harden Runner
450-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
450+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
451451
with:
452452
egress-policy: audit
453453

@@ -504,7 +504,7 @@ jobs:
504504
timeout-minutes: 25
505505
steps:
506506
- name: Harden Runner
507-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
507+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
508508
with:
509509
egress-policy: audit
510510

@@ -541,7 +541,7 @@ jobs:
541541
timeout-minutes: 25
542542
steps:
543543
- name: Harden Runner
544-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
544+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
545545
with:
546546
egress-policy: audit
547547

@@ -579,7 +579,7 @@ jobs:
579579
timeout-minutes: 25
580580
steps:
581581
- name: Harden Runner
582-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
582+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
583583
with:
584584
egress-policy: audit
585585

@@ -627,7 +627,7 @@ jobs:
627627
timeout-minutes: 20
628628
steps:
629629
- name: Harden Runner
630-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
630+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
631631
with:
632632
egress-policy: audit
633633

@@ -653,7 +653,7 @@ jobs:
653653
timeout-minutes: 20
654654
steps:
655655
- name: Harden Runner
656-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
656+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
657657
with:
658658
egress-policy: audit
659659

@@ -685,7 +685,7 @@ jobs:
685685
name: ${{ matrix.variant.name }}
686686
steps:
687687
- name: Harden Runner
688-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
688+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
689689
with:
690690
egress-policy: audit
691691

@@ -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' || '' }}
@@ -751,7 +754,7 @@ jobs:
751754
if: needs.changes.outputs.ts == 'true' || needs.changes.outputs.ci == 'true'
752755
steps:
753756
- name: Harden Runner
754-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
757+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
755758
with:
756759
egress-policy: audit
757760

@@ -828,7 +831,7 @@ jobs:
828831

829832
steps:
830833
- name: Harden Runner
831-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
834+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
832835
with:
833836
egress-policy: audit
834837

@@ -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
@@ -902,7 +905,7 @@ jobs:
902905
if: always()
903906
steps:
904907
- name: Harden Runner
905-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
908+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
906909
with:
907910
egress-policy: audit
908911

@@ -938,7 +941,7 @@ jobs:
938941
runs-on: ${{ github.repository_owner == 'coder' && 'depot-macos-latest' || 'macos-latest' }}
939942
steps:
940943
- name: Harden Runner
941-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
944+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
942945
with:
943946
egress-policy: audit
944947

@@ -1024,7 +1027,7 @@ jobs:
10241027
IMAGE: ghcr.io/coder/coder-preview:${{ steps.build-docker.outputs.tag }}
10251028
steps:
10261029
- name: Harden Runner
1027-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
1030+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
10281031
with:
10291032
egress-policy: audit
10301033

@@ -1160,7 +1163,7 @@ jobs:
11601163
id-token: write
11611164
steps:
11621165
- name: Harden Runner
1163-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
1166+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
11641167
with:
11651168
egress-policy: audit
11661169

@@ -1222,7 +1225,7 @@ jobs:
12221225
if: github.ref == 'refs/heads/main' && !github.event.pull_request.head.repo.fork
12231226
steps:
12241227
- name: Harden Runner
1225-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
1228+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
12261229
with:
12271230
egress-policy: audit
12281231

@@ -1257,7 +1260,7 @@ jobs:
12571260
if: needs.changes.outputs.db == 'true' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main'
12581261
steps:
12591262
- name: Harden Runner
1260-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
1263+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
12611264
with:
12621265
egress-policy: audit
12631266

‎.github/workflows/contrib.yaml

Lines changed: 70 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: contrib
33
on:
44
issue_comment:
55
types: [created]
6-
pull_request_target:
6+
pull_request:
77
types:
88
- opened
99
- closed
@@ -24,33 +24,87 @@ concurrency: pr-${{ github.ref }}
2424

2525
jobs:
2626
# Dependabot is annoying, but this makes it a bit less so.
27-
auto-approve-dependabot:
27+
dependabot-automerge:
2828
runs-on: ubuntu-latest
29-
if: github.event_name == 'pull_request_target'
29+
if: github.event_name == 'pull_request' && github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'coder/coder'
3030
permissions:
3131
pull-requests: write
32+
contents: write
3233
steps:
33-
- name: Harden Runner
34-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
34+
- name: Dependabot metadata
35+
id: metadata
36+
uses: dependabot/fetch-metadata@d7267f607e9d3fb96fc2fbe83e0af444713e90b7 # v2.3.0
3537
with:
36-
egress-policy: audit
38+
github-token: "${{ secrets.GITHUB_TOKEN }}"
3739

38-
- name: auto-approve dependabot
39-
uses: hmarr/auto-approve-action@f0939ea97e9205ef24d872e76833fa908a770363 # v4.0.0
40-
if: github.actor == 'dependabot[bot]'
40+
- name: Approve the PR
41+
run: gh pr review --approve "$PR_URL"
42+
env:
43+
PR_URL: ${{github.event.pull_request.html_url}}
44+
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
45+
46+
- name: Enable auto-merge for Dependabot PRs
47+
run: gh pr merge --auto --squash "$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 }}
41100
42101
cla:
43102
runs-on: ubuntu-latest
44103
permissions:
45104
pull-requests: write
46105
steps:
47-
- name: Harden Runner
48-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
49-
with:
50-
egress-policy: audit
51-
52106
- name: cla
53-
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'
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'
54108
uses: contributor-assistant/github-action@ca4a40a7d1004f18d9960b404b97e5f30a505a08 # v2.6.1
55109
env:
56110
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -69,13 +123,8 @@ jobs:
69123
release-labels:
70124
runs-on: ubuntu-latest
71125
# Skip tagging for draft PRs.
72-
if: ${{ github.event_name == 'pull_request_target' && !github.event.pull_request.draft }}
126+
if: ${{ github.event_name == 'pull_request' && !github.event.pull_request.draft }}
73127
steps:
74-
- name: Harden Runner
75-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
76-
with:
77-
egress-policy: audit
78-
79128
- name: release-labels
80129
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
81130
with:

‎.github/workflows/docker-base.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
if: github.repository_owner == 'coder'
3939
steps:
4040
- name: Harden Runner
41-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
41+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
4242
with:
4343
egress-policy: audit
4444

0 commit comments

Comments
 (0)