Skip to content

Commit f247fda

Browse files
dannykoppingdannykopping
committed
Merge branch 'main' of github.com:/coder/coder into dk/lint-actions
Signed-off-by: Danny Kopping <danny@coder.com>
2 parents 0423938 + 8a35925 commit f247fda

File tree

270 files changed

+10133
-2323
lines changed

Some content is hidden

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

270 files changed

+10133
-2323
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

@@ -199,7 +199,7 @@ jobs:
199199

200200
gen:
201201
timeout-minutes: 8
202-
runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-8vcpu-ubuntu-2204' || 'ubuntu-latest' }}
202+
runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-8' || 'ubuntu-latest' }}
203203
needs: changes
204204
if: needs.changes.outputs.docs-only == 'false' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main'
205205
steps:
@@ -249,7 +249,7 @@ jobs:
249249
fmt:
250250
needs: changes
251251
if: needs.changes.outputs.offlinedocs-only == 'false' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main'
252-
runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-8vcpu-ubuntu-2204' || 'ubuntu-latest' }}
252+
runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-8' || 'ubuntu-latest' }}
253253
timeout-minutes: 7
254254
steps:
255255
- name: Checkout
@@ -260,12 +260,9 @@ jobs:
260260
- name: Setup Node
261261
uses: ./.github/actions/setup-node
262262

263+
# Use default Go version
263264
- name: Setup Go
264-
uses: buildjet/setup-go@v5
265-
with:
266-
# This doesn't need caching. It's super fast anyways!
267-
cache: false
268-
go-version: 1.21.9
265+
uses: ./.github/actions/setup-go
269266

270267
- name: Install shfmt
271268
run: go install mvdan.cc/sh/v3/cmd/shfmt@v3.7.0
@@ -279,7 +276,7 @@ jobs:
279276
run: ./scripts/check_unstaged.sh
280277

281278
test-go:
282-
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 }}
279+
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 }}
283280
needs: changes
284281
if: needs.changes.outputs.go == 'true' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main'
285282
timeout-minutes: 20
@@ -335,7 +332,7 @@ jobs:
335332
api-key: ${{ secrets.DATADOG_API_KEY }}
336333

337334
test-go-pg:
338-
runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-8vcpu-ubuntu-2204' || 'ubuntu-latest' }}
335+
runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-8' || 'ubuntu-latest' }}
339336
needs:
340337
- changes
341338
if: needs.changes.outputs.go == 'true' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main'
@@ -370,7 +367,7 @@ jobs:
370367
api-key: ${{ secrets.DATADOG_API_KEY }}
371368

372369
test-go-race:
373-
runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-8vcpu-ubuntu-2204' || 'ubuntu-latest' }}
370+
runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-8' || 'ubuntu-latest' }}
374371
needs: changes
375372
if: needs.changes.outputs.go == 'true' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main'
376373
timeout-minutes: 25
@@ -405,7 +402,7 @@ jobs:
405402
# These tests are skipped in the main go test jobs because they require root
406403
# and mess with networking.
407404
test-go-tailnet-integration:
408-
runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-8vcpu-ubuntu-2204' || 'ubuntu-latest' }}
405+
runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-8' || 'ubuntu-latest' }}
409406
needs: changes
410407
# Unnecessary to run on main for now
411408
if: needs.changes.outputs.tailnet-integration == 'true' || needs.changes.outputs.ci == 'true'
@@ -427,7 +424,7 @@ jobs:
427424
run: make test-tailnet-integration
428425

429426
test-js:
430-
runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-8vcpu-ubuntu-2204' || 'ubuntu-latest' }}
427+
runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-8' || 'ubuntu-latest' }}
431428
needs: changes
432429
if: needs.changes.outputs.ts == 'true' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main'
433430
timeout-minutes: 20
@@ -444,7 +441,7 @@ jobs:
444441
working-directory: site
445442

446443
test-e2e:
447-
runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-16vcpu-ubuntu-2204' || 'ubuntu-latest' }}
444+
runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-16' || 'ubuntu-latest' }}
448445
needs: changes
449446
if: needs.changes.outputs.go == 'true' || needs.changes.outputs.ts == 'true' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main'
450447
timeout-minutes: 20
@@ -588,7 +585,7 @@ jobs:
588585
offlinedocs:
589586
name: offlinedocs
590587
needs: changes
591-
runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-8vcpu-ubuntu-2204' || 'ubuntu-latest' }}
588+
runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-8' || 'ubuntu-latest' }}
592589
if: needs.changes.outputs.offlinedocs == 'true' || needs.changes.outputs.ci == 'true' || needs.changes.outputs.docs == 'true'
593590

594591
steps:
@@ -686,11 +683,10 @@ jobs:
686683
687684
build:
688685
# This builds and publishes ghcr.io/coder/coder-preview:main for each commit
689-
# to main branch. We are only building this for amd64 platform. (>95% pulls
690-
# are for amd64)
686+
# to main branch.
691687
needs: changes
692688
if: github.ref == 'refs/heads/main' && needs.changes.outputs.docs-only == 'false' && !github.event.pull_request.head.repo.fork
693-
runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-8vcpu-ubuntu-2204' || 'ubuntu-latest' }}
689+
runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-8' || 'ubuntu-latest' }}
694690
env:
695691
DOCKER_CLI_EXPERIMENTAL: "enabled"
696692
outputs:
@@ -896,7 +892,7 @@ jobs:
896892
# runs sqlc-vet to ensure all queries are valid. This catches any mistakes
897893
# in migrations or sqlc queries that makes a query unable to be prepared.
898894
sqlc-vet:
899-
runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-8vcpu-ubuntu-2204' || 'ubuntu-latest' }}
895+
runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-8' || 'ubuntu-latest' }}
900896
needs: changes
901897
if: needs.changes.outputs.db == 'true' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main'
902898
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: ${{ github.repository_owner == 'coder' && 'buildjet-8vcpu-ubuntu-2204' || 'ubuntu-latest' }}
14+
runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-8' || 'ubuntu-latest' }}
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: ${{ github.repository_owner == 'coder' && 'buildjet-2vcpu-ubuntu-2204' || 'ubuntu-latest' }}
43+
runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04' || 'ubuntu-latest' }}
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

‎Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -865,3 +865,7 @@ test-tailnet-integration:
865865
test-clean:
866866
go clean -testcache
867867
.PHONY: test-clean
868+
869+
.PHONY: test-e2e
870+
test-e2e:
871+
cd ./site && DEBUG=pw:api pnpm playwright:test --forbid-only --workers 1

‎README.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@
2020
<br>
2121
<br>
2222

23-
[Quickstart](#quickstart) | [Docs](https://coder.com/docs) | [Why Coder](https://coder.com/why) | [Enterprise](https://coder.com/docs/v2/latest/enterprise)
23+
[Quickstart](#quickstart) | [Docs](https://coder.com/docs) | [Why Coder](https://coder.com/why) | [Enterprise](https://coder.com/docs/enterprise)
2424

2525
[![discord](https://img.shields.io/discord/747933592273027093?label=discord)](https://discord.gg/coder)
2626
[![release](https://img.shields.io/github/v/release/coder/coder)](https://github.com/coder/coder/releases/latest)
2727
[![godoc](https://pkg.go.dev/badge/github.com/coder/coder.svg)](https://pkg.go.dev/github.com/coder/coder)
28-
[![Go Report Card](https://goreportcard.com/badge/github.com/coder/coder)](https://goreportcard.com/report/github.com/coder/coder)
28+
[![Go Report Card](https://goreportcard.com/badge/github.com/coder/coder/v2)](https://goreportcard.com/report/github.com/coder/coder/v2)
2929
[![license](https://img.shields.io/github/license/coder/coder)](./LICENSE)
3030

3131
</div>
3232

33-
[Coder](https://coder.com) enables organizations to set up development environments in their public or private cloud infrastructure. Cloud development environments are defined with Terraform, connected through a secure high-speed Wireguard® tunnel, and are automatically shut down when not in use to save on costs. Coder gives engineering teams the flexibility to use the cloud for workloads that are most beneficial to them.
33+
[Coder](https://coder.com) enables organizations to set up development environments in their public or private cloud infrastructure. Cloud development environments are defined with Terraform, connected through a secure high-speed Wireguard® tunnel, and automatically shut down when not used to save on costs. Coder gives engineering teams the flexibility to use the cloud for workloads most beneficial to them.
3434

3535
- Define cloud development environments in Terraform
3636
- EC2 VMs, Kubernetes Pods, Docker Containers, etc.
@@ -53,7 +53,7 @@ curl -L https://coder.com/install.sh | sh
5353
coder server
5454
5555
# Navigate to http://localhost:3000 to create your initial user,
56-
# create a Docker template, and provision a workspace
56+
# create a Docker template and provision a workspace
5757
```
5858

5959
## Install
@@ -69,7 +69,7 @@ curl -L https://coder.com/install.sh | sh
6969

7070
You can run the install script with `--dry-run` to see the commands that will be used to install without executing them. Run the install script with `--help` for additional flags.
7171

72-
> See [install](https://coder.com/docs/v2/latest/install) for additional methods.
72+
> See [install](https://coder.com/docs/install) for additional methods.
7373
7474
Once installed, you can start a production deployment with a single command:
7575

@@ -81,27 +81,27 @@ coder server
8181
coder server --postgres-url <url> --access-url <url>
8282
```
8383

84-
Use `coder --help` to get a list of flags and environment variables. Use our [install guides](https://coder.com/docs/v2/latest/install) for a full walkthrough.
84+
Use `coder --help` to get a list of flags and environment variables. Use our [install guides](https://coder.com/docs/install) for a complete walkthrough.
8585

8686
## Documentation
8787

88-
Browse our docs [here](https://coder.com/docs/v2) or visit a specific section below:
88+
Browse our docs [here](https://coder.com/docs) or visit a specific section below:
8989

90-
- [**Templates**](https://coder.com/docs/v2/latest/templates): Templates are written in Terraform and describe the infrastructure for workspaces
91-
- [**Workspaces**](https://coder.com/docs/v2/latest/workspaces): Workspaces contain the IDEs, dependencies, and configuration information needed for software development
92-
- [**IDEs**](https://coder.com/docs/v2/latest/ides): Connect your existing editor to a workspace
93-
- [**Administration**](https://coder.com/docs/v2/latest/admin): Learn how to operate Coder
94-
- [**Enterprise**](https://coder.com/docs/v2/latest/enterprise): Learn about our paid features built for large teams
90+
- [**Templates**](https://coder.com/docs/templates): Templates are written in Terraform and describe the infrastructure for workspaces
91+
- [**Workspaces**](https://coder.com/docs/workspaces): Workspaces contain the IDEs, dependencies, and configuration information needed for software development
92+
- [**IDEs**](https://coder.com/docs/ides): Connect your existing editor to a workspace
93+
- [**Administration**](https://coder.com/docs/admin): Learn how to operate Coder
94+
- [**Enterprise**](https://coder.com/docs/enterprise): Learn about our paid features built for large teams
9595

9696
## Support
9797

9898
Feel free to [open an issue](https://github.com/coder/coder/issues/new) if you have questions, run into bugs, or have a feature request.
9999

100-
[Join our Discord](https://discord.gg/coder) to provide feedback on in-progress features, and chat with the community using Coder!
100+
[Join our Discord](https://discord.gg/coder) to provide feedback on in-progress features and chat with the community using Coder!
101101

102102
## Integrations
103103

104-
We are always working on new integrations. Feel free to open an issue to request an integration. Contributions are welcome in any official or community repositories.
104+
We are always working on new integrations. Please feel free to open an issue and ask for an integration. Contributions are welcome in any official or community repositories.
105105

106106
### Official
107107

@@ -120,7 +120,7 @@ We are always working on new integrations. Feel free to open an issue to request
120120
## Contributing
121121

122122
We are always happy to see new contributors to Coder. If you are new to the Coder codebase, we have
123-
[a guide on how to get started](https://coder.com/docs/v2/latest/CONTRIBUTING). We'd love to see your
123+
[a guide on how to get started](https://coder.com/docs/CONTRIBUTING). We'd love to see your
124124
contributions!
125125

126126
## Hiring

0 commit comments

Comments
 (0)