Skip to content

Commit 649fe6b

Browse files
author
Yixin Hao
committed
Merge tag 'v2.3.3' into immoral-v0.17.0
release v2.3.3
2 parents 182c8f7 + e491217 commit 649fe6b

File tree

1,771 files changed

+87733
-53226
lines changed

Some content is hidden

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

1,771 files changed

+87733
-53226
lines changed

‎.git-blame-ignore-revs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# If you would like `git blame` to ignore commits from this file, run...
2+
# git config blame.ignoreRevsFile .git-blame-ignore-revs
3+
4+
# chore: format code with semicolons when using prettier (#9555)
5+
988c9af0153561397686c119da9d1336d2433fdd

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: |
44
inputs:
55
version:
66
description: "The Go version to use."
7-
default: "1.20.7"
7+
default: "1.20.10"
88
runs:
99
using: "composite"
1010
steps:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ runs:
55
using: "composite"
66
steps:
77
- name: Setup sqlc
8-
uses: sqlc-dev/setup-sqlc@v3
8+
uses: sqlc-dev/setup-sqlc@v4
99
with:
1010
sqlc-version: "1.20.0"

‎.github/actions/upload-datadog/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ runs:
2020
echo "No API key provided, skipping..."
2121
exit 0
2222
fi
23-
npm install -g @datadog/datadog-ci@2.10.0
23+
npm install -g @datadog/datadog-ci@2.21.0
2424
datadog-ci junit upload --service coder ./gotests.xml \
2525
--tags os:${{runner.os}} --tags runner_name:${{runner.name}}
2626
env:

‎.github/dependabot.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ updates:
9292
- dependency-name: "@types/node"
9393
update-types:
9494
- version-update:semver-major
95+
open-pull-requests-limit: 15
9596
groups:
9697
react:
9798
patterns:

‎.github/pr-deployments/template/main.tf

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
terraform {
22
required_providers {
33
coder = {
4-
source = "coder/coder"
5-
version = "~> 0.11.0"
4+
source = "coder/coder"
65
}
76
kubernetes = {
8-
source = "hashicorp/kubernetes"
9-
version = "~> 2.22"
7+
source = "hashicorp/kubernetes"
108
}
119
}
1210
}
@@ -237,6 +235,9 @@ resource "kubernetes_deployment" "main" {
237235
"app.kubernetes.io/name" = "coder-workspace"
238236
}
239237
}
238+
strategy {
239+
type = "Recreate"
240+
}
240241

241242
template {
242243
metadata {

‎.github/workflows/ci.yaml

Lines changed: 39 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
offlinedocs: ${{ steps.filter.outputs.offlinedocs }}
4040
steps:
4141
- name: Checkout
42-
uses: actions/checkout@v3
42+
uses: actions/checkout@v4
4343
with:
4444
fetch-depth: 1
4545
# For pull requests it's not necessary to checkout the code
@@ -53,7 +53,6 @@ jobs:
5353
docs:
5454
- "docs/**"
5555
- "README.md"
56-
- "examples/templates/**"
5756
- "examples/web-server/**"
5857
- "examples/monitoring/**"
5958
- "examples/lima/**"
@@ -110,7 +109,7 @@ jobs:
110109
runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-8vcpu-ubuntu-2204' || 'ubuntu-latest' }}
111110
steps:
112111
- name: Checkout
113-
uses: actions/checkout@v3
112+
uses: actions/checkout@v4
114113
with:
115114
fetch-depth: 1
116115

@@ -137,7 +136,7 @@ jobs:
137136
138137
# Check for any typos
139138
- name: Check for typos
140-
uses: crate-ci/typos@v1.16.10
139+
uses: crate-ci/typos@v1.16.21
141140
with:
142141
config: .github/workflows/typos.toml
143142

@@ -165,7 +164,7 @@ jobs:
165164
if: needs.changes.outputs.docs-only == 'false' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main'
166165
steps:
167166
- name: Checkout
168-
uses: actions/checkout@v3
167+
uses: actions/checkout@v4
169168
with:
170169
fetch-depth: 1
171170

@@ -209,7 +208,7 @@ jobs:
209208
timeout-minutes: 7
210209
steps:
211210
- name: Checkout
212-
uses: actions/checkout@v3
211+
uses: actions/checkout@v4
213212
with:
214213
fetch-depth: 1
215214

@@ -221,10 +220,10 @@ jobs:
221220
with:
222221
# This doesn't need caching. It's super fast anyways!
223222
cache: false
224-
go-version: 1.20.7
223+
go-version: 1.20.10
225224

226225
- name: Install shfmt
227-
run: go install mvdan.cc/sh/v3/cmd/shfmt@v3.5.0
226+
run: go install mvdan.cc/sh/v3/cmd/shfmt@v3.7.0
228227

229228
- name: make fmt
230229
run: |
@@ -235,7 +234,7 @@ jobs:
235234
run: ./scripts/check_unstaged.sh
236235

237236
test-go:
238-
runs-on: ${{ matrix.os == 'ubuntu-latest' && github.repository_owner == 'coder' && 'buildjet-4vcpu-ubuntu-2204' || matrix.os == 'macos-latest' && github.repository_owner == 'coder' && 'macos-latest-xl' || matrix.os == 'windows-2019' && github.repository_owner == 'coder' && 'windows-latest-8-cores' || matrix.os }}
237+
runs-on: ${{ matrix.os == 'ubuntu-latest' && github.repository_owner == 'coder' && 'buildjet-4vcpu-ubuntu-2204' || matrix.os == 'macos-latest' && github.repository_owner == 'coder' && 'macos-latest-xlarge' || matrix.os == 'windows-2022' && github.repository_owner == 'coder' && 'windows-latest-16-cores' || matrix.os }}
239238
needs: changes
240239
if: needs.changes.outputs.go == 'true' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main'
241240
timeout-minutes: 20
@@ -245,10 +244,10 @@ jobs:
245244
os:
246245
- ubuntu-latest
247246
- macos-latest
248-
- windows-2019
247+
- windows-2022
249248
steps:
250249
- name: Checkout
251-
uses: actions/checkout@v3
250+
uses: actions/checkout@v4
252251
with:
253252
fetch-depth: 1
254253

@@ -272,22 +271,29 @@ jobs:
272271
echo "cover=false" >> $GITHUB_OUTPUT
273272
fi
274273
274+
# if macOS, install google-chrome for scaletests. As another concern,
275+
# should we really have this kind of external dependency requirement
276+
# on standard CI?
277+
if [ "${{ matrix.os }}" == "macos-latest" ]; then
278+
brew install google-chrome
279+
fi
280+
275281
# By default Go will use the number of logical CPUs, which
276282
# is a fine default.
277283
PARALLEL_FLAG=""
278284
285+
# macOS will output "The default interactive shell is now zsh"
286+
# intermittently in CI...
287+
if [ "${{ matrix.os }}" == "macos-latest" ]; then
288+
touch ~/.bash_profile && echo "export BASH_SILENCE_DEPRECATION_WARNING=1" >> ~/.bash_profile
289+
fi
279290
export TS_DEBUG_DISCO=true
280291
gotestsum --junitfile="gotests.xml" --jsonfile="gotests.json" \
281292
--packages="./..." -- $PARALLEL_FLAG -short -failfast $COVERAGE_FLAGS
282293
283-
- name: Print test stats
284-
if: success() || failure()
285-
run: |
286-
# Artifacts are not available after rerunning a job,
287-
# so we need to print the test stats to the log.
288-
go run ./scripts/ci-report/main.go gotests.json | tee gotests_stats.json
289-
290294
- name: Upload test stats to Datadog
295+
timeout-minutes: 1
296+
continue-on-error: true
291297
uses: ./.github/actions/upload-datadog
292298
if: success() || failure()
293299
with:
@@ -317,7 +323,7 @@ jobs:
317323
timeout-minutes: 25
318324
steps:
319325
- name: Checkout
320-
uses: actions/checkout@v3
326+
uses: actions/checkout@v4
321327
with:
322328
fetch-depth: 1
323329

@@ -332,14 +338,9 @@ jobs:
332338
export TS_DEBUG_DISCO=true
333339
make test-postgres
334340
335-
- name: Print test stats
336-
if: success() || failure()
337-
run: |
338-
# Artifacts are not available after rerunning a job,
339-
# so we need to print the test stats to the log.
340-
go run ./scripts/ci-report/main.go gotests.json | tee gotests_stats.json
341-
342341
- name: Upload test stats to Datadog
342+
timeout-minutes: 1
343+
continue-on-error: true
343344
uses: ./.github/actions/upload-datadog
344345
if: success() || failure()
345346
with:
@@ -365,7 +366,7 @@ jobs:
365366
timeout-minutes: 25
366367
steps:
367368
- name: Checkout
368-
uses: actions/checkout@v3
369+
uses: actions/checkout@v4
369370
with:
370371
fetch-depth: 1
371372

@@ -380,14 +381,16 @@ jobs:
380381
gotestsum --junitfile="gotests.xml" -- -race ./...
381382
382383
- name: Upload test stats to Datadog
384+
timeout-minutes: 1
385+
continue-on-error: true
383386
uses: ./.github/actions/upload-datadog
384387
if: always()
385388
with:
386389
api-key: ${{ secrets.DATADOG_API_KEY }}
387390

388391
deploy:
389392
name: "deploy"
390-
runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-8vcpu-ubuntu-2204' || 'ubuntu-latest' }}
393+
runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-16vcpu-ubuntu-2204' || 'ubuntu-latest' }}
391394
timeout-minutes: 30
392395
needs: changes
393396
if: |
@@ -398,7 +401,7 @@ jobs:
398401
id-token: write
399402
steps:
400403
- name: Checkout
401-
uses: actions/checkout@v3
404+
uses: actions/checkout@v4
402405
with:
403406
fetch-depth: 0
404407

@@ -486,7 +489,7 @@ jobs:
486489
timeout-minutes: 20
487490
steps:
488491
- name: Checkout
489-
uses: actions/checkout@v3
492+
uses: actions/checkout@v4
490493
with:
491494
fetch-depth: 1
492495

@@ -510,13 +513,13 @@ jobs:
510513
flags: unittest-js
511514

512515
test-e2e:
513-
runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-8vcpu-ubuntu-2204' || 'ubuntu-latest' }}
516+
runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-16vcpu-ubuntu-2204' || 'ubuntu-latest' }}
514517
needs: changes
515518
if: needs.changes.outputs.go == 'true' || needs.changes.outputs.ts == 'true' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main'
516519
timeout-minutes: 20
517520
steps:
518521
- name: Checkout
519-
uses: actions/checkout@v3
522+
uses: actions/checkout@v4
520523
with:
521524
fetch-depth: 1
522525

@@ -582,7 +585,7 @@ jobs:
582585
if: needs.changes.outputs.ts == 'true' || needs.changes.outputs.ci == 'true'
583586
steps:
584587
- name: Checkout
585-
uses: actions/checkout@v3
588+
uses: actions/checkout@v4
586589
with:
587590
# Required by Chromatic for build-over-build history, otherwise we
588591
# only get 1 commit on shallow checkout.
@@ -647,7 +650,7 @@ jobs:
647650
if: needs.changes.outputs.offlinedocs == 'true' || needs.changes.outputs.ci == 'true'
648651
steps:
649652
- name: Checkout
650-
uses: actions/checkout@v3
653+
uses: actions/checkout@v4
651654
with:
652655
# 0 is required here for version.sh to work.
653656
fetch-depth: 0
@@ -727,7 +730,7 @@ jobs:
727730
DOCKER_CLI_EXPERIMENTAL: "enabled"
728731
steps:
729732
- name: Checkout
730-
uses: actions/checkout@v3
733+
uses: actions/checkout@v4
731734
with:
732735
fetch-depth: 0
733736

@@ -741,7 +744,7 @@ jobs:
741744
uses: ./.github/actions/setup-sqlc
742745

743746
- name: GHCR Login
744-
uses: docker/login-action@v2
747+
uses: docker/login-action@v3
745748
with:
746749
registry: ghcr.io
747750
username: ${{ github.actor }}

‎.github/workflows/contrib.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
steps:
3535
- name: cla
3636
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'
37-
uses: contributor-assistant/github-action@v2.3.0
37+
uses: contributor-assistant/github-action@v2.3.1
3838
env:
3939
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4040
# the below token should have repo scope and must be manually added by you in the repository's secret

‎.github/workflows/docker-base.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ jobs:
3232
if: github.repository_owner == 'coder'
3333
steps:
3434
- name: Checkout
35-
uses: actions/checkout@v3
35+
uses: actions/checkout@v4
3636

3737
- name: Docker login
38-
uses: docker/login-action@v2
38+
uses: docker/login-action@v3
3939
with:
4040
registry: ghcr.io
4141
username: ${{ github.actor }}

‎.github/workflows/dogfood.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
runs-on: buildjet-4vcpu-ubuntu-2204
2424
steps:
2525
- name: Checkout
26-
uses: actions/checkout@v3
26+
uses: actions/checkout@v4
2727

2828
- name: Get branch name
2929
id: branch-name
@@ -38,15 +38,15 @@ jobs:
3838
echo "tag=${tag}" >> $GITHUB_OUTPUT
3939
4040
- name: Install Nix
41-
uses: DeterminateSystems/nix-installer-action@v4
41+
uses: DeterminateSystems/nix-installer-action@v6
4242

4343
- name: Run the Magic Nix Cache
4444
uses: DeterminateSystems/magic-nix-cache-action@v2
4545

4646
- run: nix build .#devEnvImage && ./result | docker load
4747

4848
- name: Login to DockerHub
49-
uses: docker/login-action@v2
49+
uses: docker/login-action@v3
5050
with:
5151
username: ${{ secrets.DOCKERHUB_USERNAME }}
5252
password: ${{ secrets.DOCKERHUB_PASSWORD }}
@@ -61,7 +61,7 @@ jobs:
6161
runs-on: ubuntu-latest
6262
steps:
6363
- name: Checkout
64-
uses: actions/checkout@v3
64+
uses: actions/checkout@v4
6565

6666
- name: Get short commit SHA
6767
id: vars

‎.github/workflows/nightly-gauntlet.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
timeout-minutes: 240
1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v3
20+
uses: actions/checkout@v4
2121

2222
- name: Setup Go
2323
uses: ./.github/actions/setup-go
@@ -44,7 +44,7 @@ jobs:
4444
timeout-minutes: 10
4545
steps:
4646
- name: Checkout
47-
uses: actions/checkout@v3
47+
uses: actions/checkout@v4
4848

4949
- name: Setup Go
5050
uses: ./.github/actions/setup-go

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Assign author
17-
uses: toshimaru/auto-author-assign@v1.6.2
17+
uses: toshimaru/auto-author-assign@v2.0.1

0 commit comments

Comments
 (0)