Skip to content

Commit be0c1f5

Browse files
austinrhodeaustinrhode
committed
Merge branch 'main' into austinrhode/groups
2 parents c865d65 + d7eadee commit be0c1f5

File tree

241 files changed

+9000
-2228
lines changed

Some content is hidden

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

241 files changed

+9000
-2228
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ description: |
44
inputs:
55
version:
66
description: "The Go version to use."
7-
default: "1.22.3"
7+
default: "1.22.4"
88
runs:
99
using: "composite"
1010
steps:
1111
- name: Setup Go
12-
uses: buildjet/setup-go@v5
12+
uses: actions/setup-go@v5
1313
with:
1414
go-version: ${{ inputs.version }}
1515

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ runs:
1515
with:
1616
version: 8
1717
- name: Setup Node
18-
uses: buildjet/setup-node@v4.0.1
18+
uses: actions/setup-node@v4.0.1
1919
with:
2020
node-version: 18.19.0
2121
# See https://github.com/actions/setup-node#caching-global-packages-data

‎.github/workflows/ci.yaml

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ jobs:
120120
update-flake:
121121
needs: changes
122122
if: needs.changes.outputs.gomod == 'true'
123-
runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-8vcpu-ubuntu-2204' || 'ubuntu-latest' }}
123+
runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-8' || 'ubuntu-latest' }}
124124
steps:
125125
- name: Checkout
126126
uses: actions/checkout@v4
@@ -139,7 +139,7 @@ jobs:
139139
lint:
140140
needs: changes
141141
if: needs.changes.outputs.offlinedocs-only == 'false' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main'
142-
runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-8vcpu-ubuntu-2204' || 'ubuntu-latest' }}
142+
runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-8' || 'ubuntu-latest' }}
143143
steps:
144144
- name: Checkout
145145
uses: actions/checkout@v4
@@ -160,7 +160,7 @@ jobs:
160160
echo "LINT_CACHE_DIR=$dir" >> $GITHUB_ENV
161161
162162
- name: golangci-lint cache
163-
uses: buildjet/cache@v4
163+
uses: actions/cache@v4
164164
with:
165165
path: |
166166
${{ env.LINT_CACHE_DIR }}
@@ -170,7 +170,7 @@ jobs:
170170
171171
# Check for any typos
172172
- name: Check for typos
173-
uses: crate-ci/typos@v1.22.3
173+
uses: crate-ci/typos@v1.22.9
174174
with:
175175
config: .github/workflows/typos.toml
176176

@@ -193,7 +193,7 @@ jobs:
193193
194194
gen:
195195
timeout-minutes: 8
196-
runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-8vcpu-ubuntu-2204' || 'ubuntu-latest' }}
196+
runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-8' || 'ubuntu-latest' }}
197197
needs: changes
198198
if: needs.changes.outputs.docs-only == 'false' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main'
199199
steps:
@@ -243,7 +243,7 @@ jobs:
243243
fmt:
244244
needs: changes
245245
if: needs.changes.outputs.offlinedocs-only == 'false' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main'
246-
runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-8vcpu-ubuntu-2204' || 'ubuntu-latest' }}
246+
runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-8' || 'ubuntu-latest' }}
247247
timeout-minutes: 7
248248
steps:
249249
- name: Checkout
@@ -254,12 +254,9 @@ jobs:
254254
- name: Setup Node
255255
uses: ./.github/actions/setup-node
256256

257+
# Use default Go version
257258
- name: Setup Go
258-
uses: buildjet/setup-go@v5
259-
with:
260-
# This doesn't need caching. It's super fast anyways!
261-
cache: false
262-
go-version: 1.21.9
259+
uses: ./.github/actions/setup-go
263260

264261
- name: Install shfmt
265262
run: go install mvdan.cc/sh/v3/cmd/shfmt@v3.7.0
@@ -273,7 +270,7 @@ jobs:
273270
run: ./scripts/check_unstaged.sh
274271

275272
test-go:
276-
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 }}
273+
runs-on: ${{ matrix.os == 'ubuntu-latest' && github.repository_owner == 'coder' && 'depot-ubuntu-22.04-4' || 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 }}
277274
needs: changes
278275
if: needs.changes.outputs.go == 'true' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main'
279276
timeout-minutes: 20
@@ -329,7 +326,7 @@ jobs:
329326
api-key: ${{ secrets.DATADOG_API_KEY }}
330327

331328
test-go-pg:
332-
runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-8vcpu-ubuntu-2204' || 'ubuntu-latest' }}
329+
runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-8' || 'ubuntu-latest' }}
333330
needs:
334331
- changes
335332
if: needs.changes.outputs.go == 'true' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main'
@@ -364,7 +361,7 @@ jobs:
364361
api-key: ${{ secrets.DATADOG_API_KEY }}
365362

366363
test-go-race:
367-
runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-8vcpu-ubuntu-2204' || 'ubuntu-latest' }}
364+
runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-8' || 'ubuntu-latest' }}
368365
needs: changes
369366
if: needs.changes.outputs.go == 'true' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main'
370367
timeout-minutes: 25
@@ -399,7 +396,7 @@ jobs:
399396
# These tests are skipped in the main go test jobs because they require root
400397
# and mess with networking.
401398
test-go-tailnet-integration:
402-
runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-8vcpu-ubuntu-2204' || 'ubuntu-latest' }}
399+
runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-8' || 'ubuntu-latest' }}
403400
needs: changes
404401
# Unnecessary to run on main for now
405402
if: needs.changes.outputs.tailnet-integration == 'true' || needs.changes.outputs.ci == 'true'
@@ -421,7 +418,7 @@ jobs:
421418
run: make test-tailnet-integration
422419

423420
test-js:
424-
runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-8vcpu-ubuntu-2204' || 'ubuntu-latest' }}
421+
runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-8' || 'ubuntu-latest' }}
425422
needs: changes
426423
if: needs.changes.outputs.ts == 'true' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main'
427424
timeout-minutes: 20
@@ -438,7 +435,7 @@ jobs:
438435
working-directory: site
439436

440437
test-e2e:
441-
runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-16vcpu-ubuntu-2204' || 'ubuntu-latest' }}
438+
runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-16' || 'ubuntu-latest' }}
442439
needs: changes
443440
if: needs.changes.outputs.go == 'true' || needs.changes.outputs.ts == 'true' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main'
444441
timeout-minutes: 20
@@ -582,7 +579,7 @@ jobs:
582579
offlinedocs:
583580
name: offlinedocs
584581
needs: changes
585-
runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-8vcpu-ubuntu-2204' || 'ubuntu-latest' }}
582+
runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-8' || 'ubuntu-latest' }}
586583
if: needs.changes.outputs.offlinedocs == 'true' || needs.changes.outputs.ci == 'true' || needs.changes.outputs.docs == 'true'
587584

588585
steps:
@@ -680,11 +677,10 @@ jobs:
680677
681678
build:
682679
# This builds and publishes ghcr.io/coder/coder-preview:main for each commit
683-
# to main branch. We are only building this for amd64 platform. (>95% pulls
684-
# are for amd64)
680+
# to main branch.
685681
needs: changes
686682
if: github.ref == 'refs/heads/main' && needs.changes.outputs.docs-only == 'false' && !github.event.pull_request.head.repo.fork
687-
runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-8vcpu-ubuntu-2204' || 'ubuntu-latest' }}
683+
runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-8' || 'ubuntu-latest' }}
688684
env:
689685
DOCKER_CLI_EXPERIMENTAL: "enabled"
690686
outputs:
@@ -890,7 +886,7 @@ jobs:
890886
# runs sqlc-vet to ensure all queries are valid. This catches any mistakes
891887
# in migrations or sqlc queries that makes a query unable to be prepared.
892888
sqlc-vet:
893-
runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-8vcpu-ubuntu-2204' || 'ubuntu-latest' }}
889+
runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-8' || 'ubuntu-latest' }}
894890
needs: changes
895891
if: needs.changes.outputs.db == 'true' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main'
896892
steps:

‎.github/workflows/nightly-gauntlet.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
# While GitHub's toaster runners are likelier to flake, we want consistency
1212
# between this environment and the regular test environment for DataDog
1313
# statistics and to only show real workflow threats.
14-
runs-on: "buildjet-8vcpu-ubuntu-2204"
14+
runs-on: "depot-ubuntu-22.04-8"
1515
# This runner costs 0.016 USD per minute,
1616
# so 0.016 * 240 = 3.84 USD per run.
1717
timeout-minutes: 240
@@ -40,7 +40,7 @@ jobs:
4040

4141
go-timing:
4242
# We run these tests with p=1 so we don't need a lot of compute.
43-
runs-on: "buildjet-2vcpu-ubuntu-2204"
43+
runs-on: "depot-ubuntu-22.04"
4444
timeout-minutes: 10
4545
steps:
4646
- name: Checkout

‎.github/workflows/pr-deploy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ jobs:
189189
needs: get_info
190190
# Run build job only if there are changes in the files that we care about or if the workflow is manually triggered with --build flag
191191
if: needs.get_info.outputs.BUILD == 'true'
192-
runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-8vcpu-ubuntu-2204' || 'ubuntu-latest' }}
192+
runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-8' || 'ubuntu-latest' }}
193193
# This concurrency only cancels build jobs if a new build is triggred. It will avoid cancelling the current deployemtn in case of docs chnages.
194194
concurrency:
195195
group: build-${{ github.workflow }}-${{ github.ref }}-${{ needs.get_info.outputs.BUILD }}

‎.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ env:
3939
jobs:
4040
release:
4141
name: Build and publish
42-
runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-8vcpu-ubuntu-2204' || 'ubuntu-latest' }}
42+
runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-8' || 'ubuntu-latest' }}
4343
env:
4444
# Necessary for Docker manifest
4545
DOCKER_CLI_EXPERIMENTAL: "enabled"

‎.github/workflows/security.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ concurrency:
2323

2424
jobs:
2525
codeql:
26-
runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-8vcpu-ubuntu-2204' || 'ubuntu-latest' }}
26+
runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-8' || 'ubuntu-latest' }}
2727
steps:
2828
- name: Checkout
2929
uses: actions/checkout@v4
@@ -56,7 +56,7 @@ jobs:
5656
"${{ secrets.SLACK_SECURITY_FAILURE_WEBHOOK_URL }}"
5757
5858
trivy:
59-
runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-8vcpu-ubuntu-2204' || 'ubuntu-latest' }}
59+
runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-8' || 'ubuntu-latest' }}
6060
steps:
6161
- name: Checkout
6262
uses: actions/checkout@v4
@@ -114,7 +114,7 @@ jobs:
114114
echo "image=$(cat "$image_job")" >> $GITHUB_OUTPUT
115115
116116
- name: Run Trivy vulnerability scanner
117-
uses: aquasecurity/trivy-action@595be6a0f6560a0a8fc419ddf630567fc623531d
117+
uses: aquasecurity/trivy-action@7c2007bcb556501da015201bcba5aa14069b74e2
118118
with:
119119
image-ref: ${{ steps.build.outputs.image }}
120120
format: sarif

0 commit comments

Comments
 (0)