Skip to content

Commit 139bbf9

Browse files
kylecarbskylecarbs
committed
Merge branch 'main' into execscripts
2 parents c844462 + 2caf7a7 commit 139bbf9

File tree

607 files changed

+15139
-8247
lines changed

Some content is hidden

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

607 files changed

+15139
-8247
lines changed

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

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Upload tests to datadog
1+
name: Upload tests to Datadog
22
if: always()
33
inputs:
44
api-key:
@@ -7,8 +7,26 @@ inputs:
77
runs:
88
using: "composite"
99
steps:
10+
- name: Set work dir
11+
shell: bash
12+
run: |
13+
WORK_DIR=${{ runner.temp }}/datadog-ci
14+
mkdir -p $WORK_DIR
15+
echo "WORK_DIR=$WORK_DIR" >> $GITHUB_ENV
16+
# The npm install was taking 30s to 1m, accounting for 20+% of the total
17+
# job time.
18+
- name: Cache datadog-ci
19+
uses: buildjet/cache@v3
20+
with:
21+
path: |
22+
${{ env.WORK_DIR }}
23+
key: datadog-ci-${{ runner.os }}
24+
restore-keys: |
25+
datadog-ci-${{ runner.os }}-
26+
datadog-ci-
1027
- shell: bash
1128
run: |
29+
cd ${{ env.WORK_DIR }}
1230
owner=${{ github.repository_owner }}
1331
echo "owner: $owner"
1432
if [[ $owner != "coder" ]]; then
@@ -20,8 +38,8 @@ runs:
2038
echo "No API key provided, skipping..."
2139
exit 0
2240
fi
23-
npm install -g @datadog/datadog-ci@2.10.0
24-
datadog-ci junit upload --service coder ./gotests.xml \
41+
npm install @datadog/datadog-ci@2.10.0
42+
npm x -- datadog-ci junit upload --service coder ./gotests.xml \
2543
--tags os:${{runner.os}} --tags runner_name:${{runner.name}}
2644
env:
2745
DATADOG_API_KEY: ${{ inputs.api-key }}

‎.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/workflows/ci.yaml

Lines changed: 19 additions & 20 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.11
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

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

@@ -317,7 +316,7 @@ jobs:
317316
timeout-minutes: 25
318317
steps:
319318
- name: Checkout
320-
uses: actions/checkout@v3
319+
uses: actions/checkout@v4
321320
with:
322321
fetch-depth: 1
323322

@@ -365,7 +364,7 @@ jobs:
365364
timeout-minutes: 25
366365
steps:
367366
- name: Checkout
368-
uses: actions/checkout@v3
367+
uses: actions/checkout@v4
369368
with:
370369
fetch-depth: 1
371370

@@ -387,7 +386,7 @@ jobs:
387386

388387
deploy:
389388
name: "deploy"
390-
runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-8vcpu-ubuntu-2204' || 'ubuntu-latest' }}
389+
runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-16vcpu-ubuntu-2204' || 'ubuntu-latest' }}
391390
timeout-minutes: 30
392391
needs: changes
393392
if: |
@@ -398,7 +397,7 @@ jobs:
398397
id-token: write
399398
steps:
400399
- name: Checkout
401-
uses: actions/checkout@v3
400+
uses: actions/checkout@v4
402401
with:
403402
fetch-depth: 0
404403

@@ -486,7 +485,7 @@ jobs:
486485
timeout-minutes: 20
487486
steps:
488487
- name: Checkout
489-
uses: actions/checkout@v3
488+
uses: actions/checkout@v4
490489
with:
491490
fetch-depth: 1
492491

@@ -510,13 +509,13 @@ jobs:
510509
flags: unittest-js
511510

512511
test-e2e:
513-
runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-8vcpu-ubuntu-2204' || 'ubuntu-latest' }}
512+
runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-16vcpu-ubuntu-2204' || 'ubuntu-latest' }}
514513
needs: changes
515514
if: needs.changes.outputs.go == 'true' || needs.changes.outputs.ts == 'true' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main'
516515
timeout-minutes: 20
517516
steps:
518517
- name: Checkout
519-
uses: actions/checkout@v3
518+
uses: actions/checkout@v4
520519
with:
521520
fetch-depth: 1
522521

@@ -582,7 +581,7 @@ jobs:
582581
if: needs.changes.outputs.ts == 'true' || needs.changes.outputs.ci == 'true'
583582
steps:
584583
- name: Checkout
585-
uses: actions/checkout@v3
584+
uses: actions/checkout@v4
586585
with:
587586
# Required by Chromatic for build-over-build history, otherwise we
588587
# only get 1 commit on shallow checkout.
@@ -647,7 +646,7 @@ jobs:
647646
if: needs.changes.outputs.offlinedocs == 'true' || needs.changes.outputs.ci == 'true'
648647
steps:
649648
- name: Checkout
650-
uses: actions/checkout@v3
649+
uses: actions/checkout@v4
651650
with:
652651
# 0 is required here for version.sh to work.
653652
fetch-depth: 0
@@ -727,7 +726,7 @@ jobs:
727726
DOCKER_CLI_EXPERIMENTAL: "enabled"
728727
steps:
729728
- name: Checkout
730-
uses: actions/checkout@v3
729+
uses: actions/checkout@v4
731730
with:
732731
fetch-depth: 0
733732

@@ -741,7 +740,7 @@ jobs:
741740
uses: ./.github/actions/setup-sqlc
742741

743742
- name: GHCR Login
744-
uses: docker/login-action@v2
743+
uses: docker/login-action@v3
745744
with:
746745
registry: ghcr.io
747746
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: 3 additions & 3 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
@@ -46,7 +46,7 @@ jobs:
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-deploy.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
PR_OPEN: ${{ steps.check_pr.outputs.pr_open }}
4949
steps:
5050
- name: Checkout
51-
uses: actions/checkout@v3
51+
uses: actions/checkout@v4
5252

5353
- name: Check if PR is open
5454
id: check_pr
@@ -78,7 +78,7 @@ jobs:
7878
runs-on: "ubuntu-latest"
7979
steps:
8080
- name: Checkout
81-
uses: actions/checkout@v3
81+
uses: actions/checkout@v4
8282
with:
8383
fetch-depth: 0
8484

@@ -202,7 +202,7 @@ jobs:
202202
CODER_IMAGE_TAG: ${{ needs.get_info.outputs.CODER_IMAGE_TAG }}
203203
steps:
204204
- name: Checkout
205-
uses: actions/checkout@v3
205+
uses: actions/checkout@v4
206206
with:
207207
fetch-depth: 0
208208

@@ -216,7 +216,7 @@ jobs:
216216
uses: ./.github/actions/setup-sqlc
217217

218218
- name: GHCR Login
219-
uses: docker/login-action@v2
219+
uses: docker/login-action@v3
220220
with:
221221
registry: ghcr.io
222222
username: ${{ github.actor }}
@@ -296,7 +296,7 @@ jobs:
296296
kubectl create namespace "pr${{ env.PR_NUMBER }}"
297297
298298
- name: Checkout
299-
uses: actions/checkout@v3
299+
uses: actions/checkout@v4
300300

301301
- name: Check and Create Certificate
302302
if: needs.get_info.outputs.NEW == 'true' || github.event.inputs.deploy == 'true'

‎.github/workflows/release.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
version: ${{ steps.version.outputs.version }}
4141
steps:
4242
- name: Checkout
43-
uses: actions/checkout@v3
43+
uses: actions/checkout@v4
4444
with:
4545
fetch-depth: 0
4646

@@ -85,7 +85,7 @@ jobs:
8585
cat "$CODER_RELEASE_NOTES_FILE"
8686
8787
- name: Docker Login
88-
uses: docker/login-action@v2
88+
uses: docker/login-action@v3
8989
with:
9090
registry: ghcr.io
9191
username: ${{ github.actor }}
@@ -409,7 +409,7 @@ jobs:
409409

410410
steps:
411411
- name: Checkout
412-
uses: actions/checkout@v3
412+
uses: actions/checkout@v4
413413
with:
414414
fetch-depth: 0
415415

@@ -489,7 +489,7 @@ jobs:
489489

490490
steps:
491491
- name: Checkout
492-
uses: actions/checkout@v3
492+
uses: actions/checkout@v4
493493
with:
494494
fetch-depth: 0
495495

‎.github/workflows/security.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-8vcpu-ubuntu-2204' || 'ubuntu-latest' }}
2727
steps:
2828
- name: Checkout
29-
uses: actions/checkout@v3
29+
uses: actions/checkout@v4
3030

3131
- name: Initialize CodeQL
3232
uses: github/codeql-action/init@v2
@@ -59,7 +59,7 @@ jobs:
5959
runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-8vcpu-ubuntu-2204' || 'ubuntu-latest' }}
6060
steps:
6161
- name: Checkout
62-
uses: actions/checkout@v3
62+
uses: actions/checkout@v4
6363
with:
6464
fetch-depth: 0
6565

‎.github/workflows/stale.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
runs-on: ubuntu-latest
3535
steps:
3636
- name: Checkout repository
37-
uses: actions/checkout@v3
37+
uses: actions/checkout@v4
3838
- name: Run delete-old-branches-action
3939
uses: beatlabs/delete-old-branches-action@v0.0.10
4040
with:

0 commit comments

Comments
 (0)