Skip to content

Commit 159d107

Browse files
deansheatherdeansheather
committed
Merge branch 'main' into dean/user-maintenance-window
2 parents 6af3e33 + 616e1d7 commit 159d107

Some content is hidden

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

59 files changed

+4317
-3867
lines changed

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ runs:
1717
restore-keys: |
1818
gotoolchain-${{ runner.os }}-
1919
20-
- uses: buildjet/setup-go@v4
20+
- name: Setup Go
21+
uses: buildjet/setup-go@v4
2122
with:
2223
# We do our own caching for implementation clarity.
2324
cache: false

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ description: |
44
runs:
55
using: "composite"
66
steps:
7-
- uses: buildjet/setup-node@v3
7+
- name: Setup Node
8+
uses: buildjet/setup-node@v3
89
with:
910
node-version: 16.20.1
1011
# See https://github.com/actions/setup-node#caching-global-packages-data

‎.github/workflows/ci.yaml

+83-39
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,11 @@ jobs:
3636
k8s: ${{ steps.filter.outputs.k8s }}
3737
ci: ${{ steps.filter.outputs.ci }}
3838
steps:
39-
- uses: actions/checkout@v3
39+
- name: Checkout
40+
uses: actions/checkout@v3
4041
# For pull requests it's not necessary to checkout the code
41-
- uses: dorny/paths-filter@v2
42+
- name: check changed files
43+
uses: dorny/paths-filter@v2
4244
id: filter
4345
with:
4446
filters: |
@@ -101,9 +103,11 @@ jobs:
101103
- name: Checkout
102104
uses: actions/checkout@v3
103105

104-
- uses: ./.github/actions/setup-go
106+
- name: Setup Node
107+
uses: ./.github/actions/setup-node
105108

106-
- uses: ./.github/actions/setup-node
109+
- name: Setup Go
110+
uses: ./.github/actions/setup-go
107111

108112
- name: Get golangci-lint cache dir
109113
run: |
@@ -149,14 +153,19 @@ jobs:
149153
needs: changes
150154
if: needs.changes.outputs.docs-only == 'false' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main'
151155
steps:
152-
- uses: actions/checkout@v3
156+
- name: Checkout
157+
uses: actions/checkout@v3
153158

154-
- uses: ./.github/actions/setup-node
155-
- uses: ./.github/actions/setup-go
159+
- name: Setup Node
160+
uses: ./.github/actions/setup-node
156161

157-
- name: Install sqlc
158-
run: |
159-
curl -sSL https://github.com/kyleconroy/sqlc/releases/download/v1.18.0/sqlc_1.18.0_linux_amd64.tar.gz | sudo tar -C /usr/bin -xz sqlc
162+
- name: Setup Go
163+
uses: ./.github/actions/setup-go
164+
165+
- name: Setup sqlc
166+
uses: sqlc-dev/setup-sqlc@v3
167+
with:
168+
sqlc-version: "1.19.1"
160169

161170
- name: go install tools
162171
run: |
@@ -192,9 +201,11 @@ jobs:
192201
- name: Checkout
193202
uses: actions/checkout@v3
194203

195-
- uses: ./.github/actions/setup-node
204+
- name: Setup Node
205+
uses: ./.github/actions/setup-node
196206

197-
- uses: buildjet/setup-go@v4
207+
- name: Setup Go
208+
uses: buildjet/setup-go@v4
198209
with:
199210
# This doesn't need caching. It's super fast anyways!
200211
cache: false
@@ -235,10 +246,14 @@ jobs:
235246
- macos-latest
236247
- windows-2019
237248
steps:
238-
- uses: actions/checkout@v3
249+
- name: Checkout
250+
uses: actions/checkout@v3
239251

240-
- uses: ./.github/actions/setup-go
241-
- uses: ./.github/actions/setup-tf
252+
- name: Setup Go
253+
uses: ./.github/actions/setup-go
254+
255+
- name: Setup Terraform
256+
uses: ./.github/actions/setup-tf
242257

243258
- name: Test with Mock Database
244259
id: test
@@ -269,12 +284,14 @@ jobs:
269284
# so we need to print the test stats to the log.
270285
go run ./scripts/ci-report/main.go gotests.json | tee gotests_stats.json
271286
272-
- uses: ./.github/actions/upload-datadog
287+
- name: Upload test stats to Datadog
288+
uses: ./.github/actions/upload-datadog
273289
if: success() || failure()
274290
with:
275291
api-key: ${{ secrets.DATADOG_API_KEY }}
276292

277-
- uses: codecov/codecov-action@v3
293+
- name: Check code coverage
294+
uses: codecov/codecov-action@v3
278295
# This action has a tendency to error out unexpectedly, it has
279296
# the `fail_ci_if_error` option that defaults to `false`, but
280297
# that is no guarantee, see:
@@ -296,10 +313,14 @@ jobs:
296313
# even if some of the preceding steps are slow.
297314
timeout-minutes: 25
298315
steps:
299-
- uses: actions/checkout@v3
316+
- name: Checkout
317+
uses: actions/checkout@v3
318+
319+
- name: Setup Go
320+
uses: ./.github/actions/setup-go
300321

301-
- uses: ./.github/actions/setup-go
302-
- uses: ./.github/actions/setup-tf
322+
- name: Setup Terraform
323+
uses: ./.github/actions/setup-tf
303324

304325
- name: Test with PostgreSQL Database
305326
run: |
@@ -313,12 +334,14 @@ jobs:
313334
# so we need to print the test stats to the log.
314335
go run ./scripts/ci-report/main.go gotests.json | tee gotests_stats.json
315336
316-
- uses: ./.github/actions/upload-datadog
337+
- name: Upload test stats to Datadog
338+
uses: ./.github/actions/upload-datadog
317339
if: success() || failure()
318340
with:
319341
api-key: ${{ secrets.DATADOG_API_KEY }}
320342

321-
- uses: codecov/codecov-action@v3
343+
- name: Check code coverage
344+
uses: codecov/codecov-action@v3
322345
# This action has a tendency to error out unexpectedly, it has
323346
# the `fail_ci_if_error` option that defaults to `false`, but
324347
# that is no guarantee, see:
@@ -336,16 +359,21 @@ jobs:
336359
if: needs.changes.outputs.go == 'true' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main'
337360
timeout-minutes: 25
338361
steps:
339-
- uses: actions/checkout@v3
362+
- name: Checkout
363+
uses: actions/checkout@v3
364+
365+
- name: Setup Go
366+
uses: ./.github/actions/setup-go
340367

341-
- uses: ./.github/actions/setup-go
342-
- uses: ./.github/actions/setup-tf
368+
- name: Setup Terraform
369+
uses: ./.github/actions/setup-tf
343370

344371
- name: Run Tests
345372
run: |
346373
gotestsum --junitfile="gotests.xml" -- -race ./...
347374
348-
- uses: ./.github/actions/upload-datadog
375+
- name: Upload test stats to Datadog
376+
uses: ./.github/actions/upload-datadog
349377
if: always()
350378
with:
351379
api-key: ${{ secrets.DATADOG_API_KEY }}
@@ -362,7 +390,8 @@ jobs:
362390
contents: read
363391
id-token: write
364392
steps:
365-
- uses: actions/checkout@v3
393+
- name: Checkout
394+
uses: actions/checkout@v3
366395
with:
367396
fetch-depth: 0
368397

@@ -375,8 +404,11 @@ jobs:
375404
- name: Set up Google Cloud SDK
376405
uses: google-github-actions/setup-gcloud@v1
377406

378-
- uses: ./.github/actions/setup-go
379-
- uses: ./.github/actions/setup-node
407+
- name: Setup Node
408+
uses: ./.github/actions/setup-node
409+
410+
- name: Setup Go
411+
uses: ./.github/actions/setup-go
380412

381413
- name: Install goimports
382414
run: go install golang.org/x/tools/cmd/goimports@latest
@@ -430,7 +462,8 @@ jobs:
430462
echo "::endgroup::"
431463
done
432464
433-
- uses: actions/upload-artifact@v3
465+
- name: Upload build artifacts
466+
uses: actions/upload-artifact@v3
434467
with:
435468
name: coder
436469
path: |
@@ -445,14 +478,17 @@ jobs:
445478
if: needs.changes.outputs.ts == 'true' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main'
446479
timeout-minutes: 20
447480
steps:
448-
- uses: actions/checkout@v3
481+
- name: Checkout
482+
uses: actions/checkout@v3
449483

450-
- uses: ./.github/actions/setup-node
484+
- name: Setup Node
485+
uses: ./.github/actions/setup-node
451486

452487
- run: yarn test:ci --max-workers $(nproc)
453488
working-directory: site
454489

455-
- uses: codecov/codecov-action@v3
490+
- name: Check code coverage
491+
uses: codecov/codecov-action@v3
456492
# This action has a tendency to error out unexpectedly, it has
457493
# the `fail_ci_if_error` option that defaults to `false`, but
458494
# that is no guarantee, see:
@@ -470,11 +506,17 @@ jobs:
470506
if: needs.changes.outputs.go == 'true' || needs.changes.outputs.ts == 'true' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main'
471507
timeout-minutes: 20
472508
steps:
473-
- uses: actions/checkout@v3
509+
- name: Checkout
510+
uses: actions/checkout@v3
511+
512+
- name: Setup Node
513+
uses: ./.github/actions/setup-node
474514

475-
- uses: ./.github/actions/setup-node
476-
- uses: ./.github/actions/setup-go
477-
- uses: ./.github/actions/setup-tf
515+
- name: Setup Go
516+
uses: ./.github/actions/setup-go
517+
518+
- name: Setup Terraform
519+
uses: ./.github/actions/setup-tf
478520

479521
- name: Build
480522
run: |
@@ -503,13 +545,15 @@ jobs:
503545
needs: changes
504546
if: needs.changes.outputs.ts == 'true' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main'
505547
steps:
506-
- uses: actions/checkout@v3
548+
- name: Checkout
549+
uses: actions/checkout@v3
507550
with:
508551
# Required by Chromatic for build-over-build history, otherwise we
509552
# only get 1 commit on shallow checkout.
510553
fetch-depth: 0
511554

512-
- uses: ./.github/actions/setup-node
555+
- name: Setup Node
556+
uses: ./.github/actions/setup-node
513557

514558
# This step is not meant for mainline because any detected changes to
515559
# storybook snapshots will require manual approval/review in order for

‎.github/workflows/contrib.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ jobs:
2525
permissions:
2626
pull-requests: write
2727
steps:
28-
- uses: hmarr/auto-approve-action@v3
28+
- name: auto-approve dependabot
29+
uses: hmarr/auto-approve-action@v3
2930
if: github.actor == 'dependabot[bot]'
3031

3132
cla:
@@ -52,7 +53,8 @@ jobs:
5253
# Skip tagging for draft PRs.
5354
if: ${{ github.event_name == 'pull_request_target' && success() && !github.event.pull_request.draft }}
5455
steps:
55-
- uses: actions/github-script@v6
56+
- name: release-labels
57+
uses: actions/github-script@v6
5658
with:
5759
# This script ensures PR title and labels are in sync:
5860
#

‎.github/workflows/docker-base.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ jobs:
3131
runs-on: ubuntu-latest
3232
if: github.repository_owner == 'coder'
3333
steps:
34-
- uses: actions/checkout@v3
34+
- name: Checkout
35+
uses: actions/checkout@v3
3536

3637
- name: Docker login
3738
uses: docker/login-action@v2

‎.github/workflows/nightly-gauntlet.yaml

+16-7
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,14 @@ jobs:
1616
# so 0.016 * 240 = 3.84 USD per run.
1717
timeout-minutes: 240
1818
steps:
19-
- uses: actions/checkout@v3
19+
- name: Checkout
20+
uses: actions/checkout@v3
2021

21-
- uses: ./.github/actions/setup-go
22-
- uses: ./.github/actions/setup-tf
22+
- name: Setup Go
23+
uses: ./.github/actions/setup-go
24+
25+
- name: Setup Terraform
26+
uses: ./.github/actions/setup-tf
2327

2428
- name: Run Tests
2529
run: |
@@ -28,7 +32,8 @@ jobs:
2832
# impact.
2933
gotestsum --junitfile="gotests.xml" -- -timeout=240m -count=10 -race ./...
3034
31-
- uses: ./.github/actions/upload-datadog
35+
- name: Upload test results to DataDog
36+
uses: ./.github/actions/upload-datadog
3237
if: always()
3338
with:
3439
api-key: ${{ secrets.DATADOG_API_KEY }}
@@ -38,14 +43,18 @@ jobs:
3843
runs-on: "buildjet-2vcpu-ubuntu-2204"
3944
timeout-minutes: 10
4045
steps:
41-
- uses: actions/checkout@v3
46+
- name: Checkout
47+
uses: actions/checkout@v3
48+
49+
- name: Setup Go
50+
uses: ./.github/actions/setup-go
4251

43-
- uses: ./.github/actions/setup-go
4452
- name: Run Tests
4553
run: |
4654
gotestsum --junitfile="gotests.xml" -- --tags="timing" -p=1 -run='_Timing/' ./...
4755
48-
- uses: ./.github/actions/upload-datadog
56+
- name: Upload test results to DataDog
57+
uses: ./.github/actions/upload-datadog
4958
if: always()
5059
with:
5160
api-key: ${{ secrets.DATADOG_API_KEY }}

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ jobs:
1313
assign-author:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: toshimaru/auto-author-assign@v1.6.2
16+
- name: Assign author
17+
uses: toshimaru/auto-author-assign@v1.6.2

0 commit comments

Comments
 (0)