Skip to content

Commit 48da576

Browse files
committed
Merge remote-tracking branch 'origin/main' into docs-remove-notif-experiment
2 parents 78adb90 + 250f3c7 commit 48da576

File tree

235 files changed

+7144
-2698
lines changed

Some content is hidden

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

235 files changed

+7144
-2698
lines changed

.github/.linkspector.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@ ignorePatterns:
1919
- pattern: "code.visualstudio.com"
2020
- pattern: "www.emacswiki.org"
2121
- pattern: "linux.die.net/man"
22+
- pattern: "www.gnu.org"
2223
aliveStatusCodes:
2324
- 200

.github/cherry-pick-bot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
enabled: true
2-
preservePullRequestTitle: false
2+
preservePullRequestTitle: true

.github/workflows/ci.yaml

Lines changed: 77 additions & 53 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

@@ -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

@@ -378,8 +378,62 @@ jobs:
378378
with:
379379
api-key: ${{ secrets.DATADOG_API_KEY }}
380380

381+
# We don't run the full test-suite for Windows & MacOS, so we just run the CLI tests on every PR.
382+
# We run the test suite in test-go-pg, including CLI.
383+
test-cli:
384+
runs-on: ${{ matrix.os == 'macos-latest' && github.repository_owner == 'coder' && 'depot-macos-latest' || matrix.os == 'windows-2022' && github.repository_owner == 'coder' && 'windows-latest-16-cores' || matrix.os }}
385+
needs: changes
386+
if: needs.changes.outputs.go == 'true' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main'
387+
strategy:
388+
matrix:
389+
os:
390+
- macos-latest
391+
- windows-2022
392+
steps:
393+
- name: Harden Runner
394+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
395+
with:
396+
egress-policy: audit
397+
398+
- name: Checkout
399+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
400+
with:
401+
fetch-depth: 1
402+
403+
- name: Setup Go
404+
uses: ./.github/actions/setup-go
405+
406+
- name: Setup Terraform
407+
uses: ./.github/actions/setup-tf
408+
409+
# Sets up the ImDisk toolkit for Windows and creates a RAM disk on drive R:.
410+
- name: Setup ImDisk
411+
if: runner.os == 'Windows'
412+
uses: ./.github/actions/setup-imdisk
413+
414+
- name: Test CLI
415+
env:
416+
TS_DEBUG_DISCO: "true"
417+
LC_CTYPE: "en_US.UTF-8"
418+
LC_ALL: "en_US.UTF-8"
419+
shell: bash
420+
run: |
421+
# By default Go will use the number of logical CPUs, which
422+
# is a fine default.
423+
PARALLEL_FLAG=""
424+
425+
make test-cli
426+
427+
- name: Upload test stats to Datadog
428+
timeout-minutes: 1
429+
continue-on-error: true
430+
uses: ./.github/actions/upload-datadog
431+
if: success() || failure()
432+
with:
433+
api-key: ${{ secrets.DATADOG_API_KEY }}
434+
381435
test-go-pg:
382-
runs-on: ${{ matrix.os == 'ubuntu-latest' && github.repository_owner == 'coder' && 'depot-ubuntu-22.04-4' || matrix.os == 'macos-latest' && github.repository_owner == 'coder' && 'depot-macos-latest' || matrix.os == 'windows-2022' && github.repository_owner == 'coder' && 'windows-latest-16-cores' || matrix.os }}
436+
runs-on: ${{ matrix.os == 'ubuntu-latest' && github.repository_owner == 'coder' && 'depot-ubuntu-22.04-4' || matrix.os }}
383437
needs: changes
384438
if: needs.changes.outputs.go == 'true' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main'
385439
# This timeout must be greater than the timeout set by `go test` in
@@ -391,11 +445,9 @@ jobs:
391445
matrix:
392446
os:
393447
- ubuntu-latest
394-
- macos-latest
395-
- windows-2022
396448
steps:
397449
- name: Harden Runner
398-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
450+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
399451
with:
400452
egress-policy: audit
401453

@@ -423,39 +475,11 @@ jobs:
423475
LC_ALL: "en_US.UTF-8"
424476
shell: bash
425477
run: |
426-
# if macOS, install google-chrome for scaletests
427-
# As another concern, should we really have this kind of external dependency
428-
# requirement on standard CI?
429-
if [ "${{ matrix.os }}" == "macos-latest" ]; then
430-
brew install google-chrome
431-
fi
432-
433478
# By default Go will use the number of logical CPUs, which
434479
# is a fine default.
435480
PARALLEL_FLAG=""
436481
437-
# macOS will output "The default interactive shell is now zsh"
438-
# intermittently in CI...
439-
if [ "${{ matrix.os }}" == "macos-latest" ]; then
440-
touch ~/.bash_profile && echo "export BASH_SILENCE_DEPRECATION_WARNING=1" >> ~/.bash_profile
441-
fi
442-
443-
if [ "${{ runner.os }}" == "Linux" ]; then
444-
make test-postgres
445-
elif [ "${{ runner.os }}" == "Windows" ]; then
446-
# Create a temp dir on the R: ramdisk drive for Windows. The default
447-
# C: drive is extremely slow: https://github.com/actions/runner-images/issues/8755
448-
mkdir -p "R:/temp/embedded-pg"
449-
go run scripts/embedded-pg/main.go -path "R:/temp/embedded-pg"
450-
# Reduce test parallelism, mirroring what we do for race tests.
451-
# We'd been encountering issues with timing related flakes, and
452-
# this seems to help.
453-
DB=ci gotestsum --format standard-quiet -- -v -short -count=1 -parallel 4 -p 4 ./...
454-
else
455-
go run scripts/embedded-pg/main.go
456-
# Reduce test parallelism, like for Windows above.
457-
DB=ci gotestsum --format standard-quiet -- -v -short -count=1 -parallel 4 -p 4 ./...
458-
fi
482+
make test-postgres
459483
460484
- name: Upload test stats to Datadog
461485
timeout-minutes: 1
@@ -480,7 +504,7 @@ jobs:
480504
timeout-minutes: 25
481505
steps:
482506
- name: Harden Runner
483-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
507+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
484508
with:
485509
egress-policy: audit
486510

@@ -517,7 +541,7 @@ jobs:
517541
timeout-minutes: 25
518542
steps:
519543
- name: Harden Runner
520-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
544+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
521545
with:
522546
egress-policy: audit
523547

@@ -555,7 +579,7 @@ jobs:
555579
timeout-minutes: 25
556580
steps:
557581
- name: Harden Runner
558-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
582+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
559583
with:
560584
egress-policy: audit
561585

@@ -603,7 +627,7 @@ jobs:
603627
timeout-minutes: 20
604628
steps:
605629
- name: Harden Runner
606-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
630+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
607631
with:
608632
egress-policy: audit
609633

@@ -629,7 +653,7 @@ jobs:
629653
timeout-minutes: 20
630654
steps:
631655
- name: Harden Runner
632-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
656+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
633657
with:
634658
egress-policy: audit
635659

@@ -661,7 +685,7 @@ jobs:
661685
name: ${{ matrix.variant.name }}
662686
steps:
663687
- name: Harden Runner
664-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
688+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
665689
with:
666690
egress-policy: audit
667691

@@ -727,7 +751,7 @@ jobs:
727751
if: needs.changes.outputs.ts == 'true' || needs.changes.outputs.ci == 'true'
728752
steps:
729753
- name: Harden Runner
730-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
754+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
731755
with:
732756
egress-policy: audit
733757

@@ -804,7 +828,7 @@ jobs:
804828

805829
steps:
806830
- name: Harden Runner
807-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
831+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
808832
with:
809833
egress-policy: audit
810834

@@ -878,7 +902,7 @@ jobs:
878902
if: always()
879903
steps:
880904
- name: Harden Runner
881-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
905+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
882906
with:
883907
egress-policy: audit
884908

@@ -914,7 +938,7 @@ jobs:
914938
runs-on: ${{ github.repository_owner == 'coder' && 'depot-macos-latest' || 'macos-latest' }}
915939
steps:
916940
- name: Harden Runner
917-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
941+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
918942
with:
919943
egress-policy: audit
920944

@@ -1000,7 +1024,7 @@ jobs:
10001024
IMAGE: ghcr.io/coder/coder-preview:${{ steps.build-docker.outputs.tag }}
10011025
steps:
10021026
- name: Harden Runner
1003-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
1027+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
10041028
with:
10051029
egress-policy: audit
10061030

@@ -1136,7 +1160,7 @@ jobs:
11361160
id-token: write
11371161
steps:
11381162
- name: Harden Runner
1139-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
1163+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
11401164
with:
11411165
egress-policy: audit
11421166

@@ -1198,7 +1222,7 @@ jobs:
11981222
if: github.ref == 'refs/heads/main' && !github.event.pull_request.head.repo.fork
11991223
steps:
12001224
- name: Harden Runner
1201-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
1225+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
12021226
with:
12031227
egress-policy: audit
12041228

@@ -1233,7 +1257,7 @@ jobs:
12331257
if: needs.changes.outputs.db == 'true' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main'
12341258
steps:
12351259
- name: Harden Runner
1236-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
1260+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
12371261
with:
12381262
egress-policy: audit
12391263

.github/workflows/contrib.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
pull-requests: write
3232
steps:
3333
- name: Harden Runner
34-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
34+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
3535
with:
3636
egress-policy: audit
3737

@@ -45,7 +45,7 @@ jobs:
4545
pull-requests: write
4646
steps:
4747
- name: Harden Runner
48-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
48+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
4949
with:
5050
egress-policy: audit
5151

@@ -72,7 +72,7 @@ jobs:
7272
if: ${{ github.event_name == 'pull_request_target' && !github.event.pull_request.draft }}
7373
steps:
7474
- name: Harden Runner
75-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
75+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
7676
with:
7777
egress-policy: audit
7878

.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

.github/workflows/docs-ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Setup Node
2626
uses: ./.github/actions/setup-node
2727

28-
- uses: tj-actions/changed-files@bab30c2299617f6615ec02a68b9a40d10bd21366 # v45.0.5
28+
- uses: tj-actions/changed-files@d6e91a2266cdb9d62096cebf1e8546899c6aa18f # v45.0.6
2929
id: changed-files
3030
with:
3131
files: |

.github/workflows/dogfood.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
runs-on: ubuntu-latest
2828
steps:
2929
- name: Harden Runner
30-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
30+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
3131
with:
3232
egress-policy: audit
3333

@@ -89,7 +89,7 @@ jobs:
8989
runs-on: ubuntu-latest
9090
steps:
9191
- name: Harden Runner
92-
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
92+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
9393
with:
9494
egress-policy: audit
9595

0 commit comments

Comments
 (0)