Skip to content

Commit e16b97c

Browse files
mafredrimafredri
authored
Merge branch 'main' into ghuntley-patch-2
2 parents d89f634 + 721957d commit e16b97c

File tree

414 files changed

+12428
-5151
lines changed

Some content is hidden

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

414 files changed

+12428
-5151
lines changed

‎.github/CODEOWNERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
site/ @coder/frontend
21
docs/ @coder/docs
32
README.md @coder/docs
43
ADOPTERS.md @coder/docs

‎.github/workflows/coder.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ jobs:
215215

216216
- name: Install sqlc
217217
run: |
218-
curl -sSL https://github.com/kyleconroy/sqlc/releases/download/v1.13.0/sqlc_1.13.0_linux_amd64.tar.gz | sudo tar -C /usr/bin -xz sqlc
218+
curl -sSL https://github.com/kyleconroy/sqlc/releases/download/v1.16.0/sqlc_1.16.0_linux_amd64.tar.gz | sudo tar -C /usr/bin -xz sqlc
219219
- name: Install protoc-gen-go
220220
run: go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.26
221221
- name: Install protoc-gen-go-drpc
@@ -556,7 +556,7 @@ jobs:
556556
- name: Install node_modules
557557
run: ./scripts/yarn_install.sh
558558

559-
- run: yarn test:coverage
559+
- run: yarn test:ci
560560
working-directory: site
561561

562562
- uses: codecov/codecov-action@v3
@@ -575,7 +575,7 @@ jobs:
575575
name: "test/e2e/${{ matrix.os }}"
576576
needs:
577577
- changes
578-
if: false #needs.changes.outputs.docs-only == 'false'
578+
if: needs.changes.outputs.docs-only == 'false'
579579
runs-on: ${{ matrix.os }}
580580
timeout-minutes: 20
581581
strategy:

‎.github/workflows/release.yaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ jobs:
214214
./build/*.rpm
215215
env:
216216
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
217+
CODER_GPG_RELEASE_KEY_BASE64: ${{ secrets.CODER_GPG_RELEASE_KEY_BASE64 }}
217218

218219
- name: Authenticate to Google Cloud
219220
uses: google-github-actions/auth@v1
@@ -252,6 +253,7 @@ jobs:
252253
retention-days: 7
253254

254255
publish-winget:
256+
name: Publish to winget-pkgs
255257
runs-on: windows-latest
256258
needs: release
257259
steps:
@@ -307,18 +309,22 @@ jobs:
307309
--submit `
308310
--version "${version}" `
309311
--urls "${installer_url}|X64" `
310-
--token "${{ secrets.CDRCI_GITHUB_TOKEN }}"
312+
--token "$env:WINGET_GH_TOKEN"
311313
312314
env:
313315
# For gh CLI:
314316
GH_TOKEN: ${{ github.token }}
317+
# For wingetcreate. We need a real token since we're pushing a commit
318+
# to GitHub and then making a PR in a different repo.
319+
WINGET_GH_TOKEN: ${{ secrets.CDRCI_GITHUB_TOKEN }}
315320

316321
- name: Comment on PR
322+
if: ${{ !inputs.dry_run }}
317323
run: |
318324
# Find the PR that wingetcreate just made.
319325
$version = "${{ needs.release.outputs.version }}".Trim('v')
320326
$pr_list = gh pr list --repo microsoft/winget-pkgs --search "author:cdrci Coder.Coder version ${version}" --limit 1 --json number | `
321-
ConvertFrom-Json`
327+
ConvertFrom-Json
322328
$pr_number = $pr_list[0].number
323329
324330
gh pr comment --repo microsoft/winget-pkgs "${pr_number}" --body "🤖 cc: @deansheather @matifali"

‎.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ site/coverage/
2525
site/storybook-static/
2626
site/test-results/*
2727
site/e2e/test-results/*
28-
site/e2e/storageState.json
28+
site/e2e/states/*.json
2929
site/playwright-report/*
3030

3131
# Make target for updating golden files.
@@ -36,6 +36,9 @@ cli/testdata/.gen-golden
3636
/dist/
3737
site/out/
3838

39+
# Bundle analysis
40+
site/stats/
41+
3942
*.tfstate
4043
*.tfstate.backup
4144
*.tfplan

‎.prettierignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ site/coverage/
2828
site/storybook-static/
2929
site/test-results/*
3030
site/e2e/test-results/*
31-
site/e2e/storageState.json
31+
site/e2e/states/*.json
3232
site/playwright-report/*
3333

3434
# Make target for updating golden files.
@@ -39,6 +39,9 @@ cli/testdata/.gen-golden
3939
/dist/
4040
site/out/
4141

42+
# Bundle analysis
43+
site/stats/
44+
4245
*.tfstate
4346
*.tfstate.backup
4447
*.tfplan

‎.vscode/settings.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,5 +198,12 @@
198198
"go.testFlags": ["-short", "-coverpkg=./..."],
199199
// We often use a version of TypeScript that's ahead of the version shipped
200200
// with VS Code.
201-
"typescript.tsdk": "./site/node_modules/typescript/lib"
201+
"typescript.tsdk": "./site/node_modules/typescript/lib",
202+
"grammarly.selectors": [
203+
{
204+
"language": "markdown",
205+
"scheme": "file",
206+
"pattern": "docs/contributing/frontend.md"
207+
}
208+
]
202209
}

‎ADOPTERS.md

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -490,10 +490,9 @@ docs/admin/prometheus.md: scripts/metricsdocgen/main.go scripts/metricsdocgen/me
490490
cd site
491491
yarn run format:write:only ../docs/admin/prometheus.md
492492

493-
coderd/apidoc/swagger.json: $(shell find ./scripts/apidocgen -not \( -path './scripts/apidocgen/node_modules' -prune \) -type f) $(wildcard coderd/*.go) $(wildcard enterprise/coderd/*.go) $(wildcard codersdk/*.go) .swaggo
493+
coderd/apidoc/swagger.json: $(shell find ./scripts/apidocgen $(FIND_EXCLUSIONS) -type f) $(wildcard coderd/*.go) $(wildcard enterprise/coderd/*.go) $(wildcard codersdk/*.go) .swaggo docs/manifest.json
494494
./scripts/apidocgen/generate.sh
495-
cd site
496-
yarn run format:write:only ../docs/api ../docs/manifest.json ../coderd/apidoc/swagger.json
495+
yarn run --cwd=site format:write:only ../docs/api ../docs/manifest.json ../coderd/apidoc/swagger.json
497496

498497
update-golden-files: cli/testdata/.gen-golden
499498
.PHONY: update-golden-files

‎README.md

Lines changed: 18 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,25 @@
1-
# Coder
1+
# Coder — Your Self-Hosted Remote Development Platform
22

33
[!["Join us on
44
Discord"](https://img.shields.io/badge/join-us%20on%20Discord-gray.svg?longCache=true&logo=discord&colorB=green)](https://coder.com/chat?utm_source=github.com/coder/coder&utm_medium=github&utm_campaign=readme.md)
55
[![codecov](https://codecov.io/gh/coder/coder/branch/main/graph/badge.svg?token=TNLW3OAP6G)](https://codecov.io/gh/coder/coder)
66
[![Go Reference](https://pkg.go.dev/badge/github.com/coder/coder.svg)](https://pkg.go.dev/github.com/coder/coder)
7-
[![Twitter
8-
Follow](https://img.shields.io/twitter/follow/coderhq?label=%40coderhq&style=social)](https://twitter.com/coderhq)
97

10-
Software development on your infrastructure. Offload your team's development from local workstations to cloud servers. Onboard developers in minutes. Build, test and compile at the speed of the cloud. Keep your source code and data behind your firewall.
8+
Offload your team's development from local workstations to cloud servers. Onboard developers in minutes. Build, test and compile at the speed of the cloud. Keep your source code and data behind your firewall.
119

1210
> "By leveraging Terraform, Coder lets developers run any IDE on any compute platform including on-prem, AWS, Azure, GCP, DigitalOcean, Kubernetes, Docker, and more, with workspaces running on Linux, Windows, or Mac." - **Kevin Fishner Chief of Staff at [HashiCorp](https://hashicorp.com/)**
1311
1412
<p align="center">
1513
<img src="./docs/images/hero-image.png">
1614
</p>
1715

18-
**Manage less**
19-
20-
- Ensure your entire team is using the same tools and resources
21-
- Rollout critical updates to your developers with one command
22-
- Automatically shut down expensive cloud resources
23-
- Keep your source code and data behind your firewall
24-
25-
**Code more**
16+
## Highlights
2617

2718
- Build and test faster
2819
- Leveraging cloud CPUs, RAM, network speeds, etc.
2920
- Access your environment from any place on any client (even an iPad)
3021
- Onboard instantly then stay up to date continuously
3122

32-
## Recommended Reading
33-
34-
- [How our development team shares one giant bare metal machine](https://coder.com/blog/how-our-development-team-shares-one-giant-bare-metal-machine?utm_source=github.com/coder/coder&utm_medium=github&utm_campaign=readme.md)
35-
- [Laptop development is dead: why remote development is the future](https://medium.com/@elliotgraebert/laptop-development-is-dead-why-remote-development-is-the-future-f92ce103fd13)
36-
- [Learn how Palantir improved build times by 78% with coder](https://blog.palantir.com/the-benefits-of-remote-ephemeral-workspaces-1a1251ed6e53).
37-
- [A software development environment is not just a container](https://coder.com/blog/not-a-container?utm_source=github.com/coder/coder&utm_medium=github&utm_campaign=readme.md).
38-
3923
## Getting Started
4024

4125
The easiest way to install Coder is to use our
@@ -73,18 +57,30 @@ coder server
7357
coder server --postgres-url <url> --access-url <url>
7458
```
7559

76-
> <sup>1</sup> The embedded database is great for trying out Coder with small deployments, but do consider using an external database for increased assurance and control.
60+
> <sup>1</sup> The automatic setup is great for trying out Coder with small deployments, but do consider using an external database for increased assurance and control.
7761
78-
Use `coder --help` to get a complete list of flags and environment variables. Use our [quickstart guide](https://coder.com/docs/coder-oss/latest/quickstart) for a full walkthrough.
62+
Use `coder --help` to get a complete list of flags and environment variables. Use our [quickstart guide](https://coder.com/docs/v2/latest/quickstart) for a full walkthrough.
7963

8064
## Documentation
8165

82-
Visit our docs [here](https://coder.com/docs/coder-oss).
66+
Visit our docs [here](https://coder.com/docs/v2).
8367

8468
## Templates
8569

8670
Find our templates [here](./examples/templates).
8771

72+
## Community and Support
73+
74+
Join our community on [Discord](https://coder.com/chat?utm_source=github.com/coder/coder&utm_medium=github&utm_campaign=readme.md) and [Twitter](https://twitter.com/coderhq)!
75+
76+
[Suggest improvements and report problems](https://github.com/coder/coder/issues/new/choose)
77+
78+
## Contributing
79+
80+
Read the [contributing docs](https://coder.com/docs/v2/latest/CONTRIBUTING).
81+
82+
Find our list of contributors [here](https://github.com/coder/coder/graphs/contributors).
83+
8884
## Comparison
8985

9086
Please file [an issue](https://github.com/coder/coder/issues/new) if any information is out of date. Also refer to:
@@ -107,17 +103,3 @@ Please file [an issue](https://github.com/coder/coder/issues/new) if any informa
107103
| [Microsoft DevBox](https://coder.com/blog/the-self-hosting-paradox?utm_source=github.com/coder/coder?utm_source=github.com/coder/coder&utm_medium=github&utm_campaign=readme.md) | Platform | SaaS (Preview, not GA) | Pay Microsoft | Yes | Australia East, Europe West, Japan East, Canada Central, UK South, US East, US East 2, US South Central, and US West 3 | Microsoft Azure Virtual Machine | N/A | Not generally available, offered in preview mode. | Windows Virtual Machine | Any application that runs on Windows via Microsoft Remote Desktop |
108104

109105
_Last updated: 14/12/2022_
110-
111-
## Community and Support
112-
113-
Join our community on [Discord](https://coder.com/chat?utm_source=github.com/coder/coder&utm_medium=github&utm_campaign=readme.md) and [Twitter](https://twitter.com/coderhq)!
114-
115-
[Suggest improvements and report problems](https://github.com/coder/coder/issues/new/choose)
116-
117-
## Contributing
118-
119-
If you're using Coder in your organization, please try to add your company name to the [ADOPTERS.md](./ADOPTERS.md). It really helps the project to gain momentum and credibility. It's a small contribution back to the project with a big impact.
120-
121-
Read the [contributing docs](https://coder.com/docs/coder-oss/latest/CONTRIBUTING).
122-
123-
Find our list of contributors [here](https://github.com/coder/coder/graphs/contributors).

0 commit comments

Comments
 (0)