Skip to content

Commit 44b84d1

Browse files
aslilacaslilac
committed
Merge branch 'main' into lilac/fix-a-bunch-of-orgs-stuff
2 parents 1bb6137 + 06b2186 commit 44b84d1

File tree

326 files changed

+15702
-2635
lines changed

Some content is hidden

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

326 files changed

+15702
-2635
lines changed

‎.devcontainer/devcontainer.json

+6-1
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,10 @@
99
}
1010
},
1111
// SYS_PTRACE to enable go debugging
12-
"runArgs": ["--cap-add=SYS_PTRACE"]
12+
"runArgs": ["--cap-add=SYS_PTRACE"],
13+
"customizations": {
14+
"vscode": {
15+
"extensions": ["biomejs.biome"]
16+
}
17+
}
1318
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ runs:
77
- name: Install Terraform
88
uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3.1.2
99
with:
10-
terraform_version: 1.9.8
10+
terraform_version: 1.10.5
1111
terraform_wrapper: false

‎.github/workflows/ci.yaml

+21-21
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@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
37+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
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@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
158+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
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@11ca4583f2f3f74c7e7785c0ecb20fe2c99a4308 # v1.29.5
191+
uses: crate-ci/typos@51f257b946f503b768e522781f56e9b7b5570d48 # v1.29.7
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@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
230+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
231231
with:
232232
egress-policy: audit
233233

@@ -290,7 +290,7 @@ jobs:
290290
timeout-minutes: 7
291291
steps:
292292
- name: Harden Runner
293-
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
293+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
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@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
334+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
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@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
394+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
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@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
450+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
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@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
507+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
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@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
544+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
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@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
582+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
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@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
630+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
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@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
656+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
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@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
688+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
689689
with:
690690
egress-policy: audit
691691

@@ -754,7 +754,7 @@ jobs:
754754
if: needs.changes.outputs.ts == 'true' || needs.changes.outputs.ci == 'true'
755755
steps:
756756
- name: Harden Runner
757-
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
757+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
758758
with:
759759
egress-policy: audit
760760

@@ -831,7 +831,7 @@ jobs:
831831

832832
steps:
833833
- name: Harden Runner
834-
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
834+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
835835
with:
836836
egress-policy: audit
837837

@@ -905,7 +905,7 @@ jobs:
905905
if: always()
906906
steps:
907907
- name: Harden Runner
908-
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
908+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
909909
with:
910910
egress-policy: audit
911911

@@ -1028,7 +1028,7 @@ jobs:
10281028
IMAGE: ghcr.io/coder/coder-preview:${{ steps.build-docker.outputs.tag }}
10291029
steps:
10301030
- name: Harden Runner
1031-
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
1031+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
10321032
with:
10331033
egress-policy: audit
10341034

@@ -1164,7 +1164,7 @@ jobs:
11641164
id-token: write
11651165
steps:
11661166
- name: Harden Runner
1167-
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
1167+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
11681168
with:
11691169
egress-policy: audit
11701170

@@ -1226,7 +1226,7 @@ jobs:
12261226
if: github.ref == 'refs/heads/main' && !github.event.pull_request.head.repo.fork
12271227
steps:
12281228
- name: Harden Runner
1229-
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
1229+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
12301230
with:
12311231
egress-policy: audit
12321232

@@ -1261,7 +1261,7 @@ jobs:
12611261
if: needs.changes.outputs.db == 'true' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main'
12621262
steps:
12631263
- name: Harden Runner
1264-
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
1264+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
12651265
with:
12661266
egress-policy: audit
12671267

‎.github/workflows/docker-base.yaml

+1-1
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@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
41+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
4242
with:
4343
egress-policy: audit
4444

‎.github/workflows/docs-ci.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ on:
1515
- "**.md"
1616
- ".github/workflows/docs-ci.yaml"
1717

18+
permissions:
19+
contents: read
20+
1821
jobs:
1922
docs:
2023
runs-on: ubuntu-latest

‎.github/workflows/dogfood.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-4' || 'ubuntu-latest' }}
2828
steps:
2929
- name: Harden Runner
30-
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
30+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
3131
with:
3232
egress-policy: audit
3333

@@ -95,7 +95,7 @@ jobs:
9595
runs-on: ubuntu-latest
9696
steps:
9797
- name: Harden Runner
98-
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
98+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
9999
with:
100100
egress-policy: audit
101101

‎.github/workflows/nightly-gauntlet.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- windows-2022
2727
steps:
2828
- name: Harden Runner
29-
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
29+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
3030
with:
3131
egress-policy: audit
3232

‎.github/workflows/pr-auto-assign.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Harden Runner
17-
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
17+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
1818
with:
1919
egress-policy: audit
2020

‎.github/workflows/pr-cleanup.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
packages: write
2020
steps:
2121
- name: Harden Runner
22-
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
22+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
2323
with:
2424
egress-policy: audit
2525

‎.github/workflows/pr-deploy.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
PR_OPEN: ${{ steps.check_pr.outputs.pr_open }}
4040
steps:
4141
- name: Harden Runner
42-
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
42+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
4343
with:
4444
egress-policy: audit
4545

@@ -74,7 +74,7 @@ jobs:
7474
runs-on: "ubuntu-latest"
7575
steps:
7676
- name: Harden Runner
77-
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
77+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
7878
with:
7979
egress-policy: audit
8080

@@ -174,7 +174,7 @@ jobs:
174174
pull-requests: write # needed for commenting on PRs
175175
steps:
176176
- name: Harden Runner
177-
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
177+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
178178
with:
179179
egress-policy: audit
180180

@@ -218,7 +218,7 @@ jobs:
218218
CODER_IMAGE_TAG: ${{ needs.get_info.outputs.CODER_IMAGE_TAG }}
219219
steps:
220220
- name: Harden Runner
221-
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
221+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
222222
with:
223223
egress-policy: audit
224224

@@ -276,7 +276,7 @@ jobs:
276276
PR_HOSTNAME: "pr${{ needs.get_info.outputs.PR_NUMBER }}.${{ secrets.PR_DEPLOYMENTS_DOMAIN }}"
277277
steps:
278278
- name: Harden Runner
279-
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
279+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
280280
with:
281281
egress-policy: audit
282282

‎.github/workflows/release-validation.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
steps:
1616
- name: Harden Runner
17-
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
17+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
1818
with:
1919
egress-policy: audit
2020

‎.github/workflows/release.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ jobs:
130130
version: ${{ steps.version.outputs.version }}
131131
steps:
132132
- name: Harden Runner
133-
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
133+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
134134
with:
135135
egress-policy: audit
136136

@@ -517,7 +517,7 @@ jobs:
517517
# TODO: skip this if it's not a new release (i.e. a backport). This is
518518
# fine right now because it just makes a PR that we can close.
519519
- name: Harden Runner
520-
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
520+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
521521
with:
522522
egress-policy: audit
523523

@@ -593,7 +593,7 @@ jobs:
593593

594594
steps:
595595
- name: Harden Runner
596-
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
596+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
597597
with:
598598
egress-policy: audit
599599

@@ -683,7 +683,7 @@ jobs:
683683
if: ${{ !inputs.dry_run }}
684684
steps:
685685
- name: Harden Runner
686-
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
686+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
687687
with:
688688
egress-policy: audit
689689

‎.github/workflows/scorecard.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
steps:
2222
- name: Harden Runner
23-
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
23+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
2424
with:
2525
egress-policy: audit
2626

‎.github/workflows/security.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-8' || 'ubuntu-latest' }}
2828
steps:
2929
- name: Harden Runner
30-
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
30+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
3131
with:
3232
egress-policy: audit
3333

@@ -67,7 +67,7 @@ jobs:
6767
runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-8' || 'ubuntu-latest' }}
6868
steps:
6969
- name: Harden Runner
70-
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
70+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
7171
with:
7272
egress-policy: audit
7373

0 commit comments

Comments
 (0)