Skip to content

Commit 403eac5

Browse files
deansheatherdeansheather
committed
Merge branch 'main' into dean/proxy-derp-map
and some other fixes
2 parents 6a08a59 + 616e1d7 commit 403eac5

File tree

512 files changed

+29232
-12029
lines changed

Some content is hidden

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

512 files changed

+29232
-12029
lines changed

‎.devcontainer/Dockerfile

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

‎.devcontainer/devcontainer.json

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,12 @@
1-
// For format details, see https://aka.ms/devcontainer.json
21
{
32
"name": "Development environments on your infrastructure",
4-
5-
// Sets the run context to one level up instead of the .devcontainer folder.
6-
"context": ".",
7-
8-
// Update the 'dockerFile' property if you aren't using the standard 'Dockerfile' filename.
9-
"dockerFile": "Dockerfile",
10-
11-
// Use 'forwardPorts' to make a list of ports inside the container available locally.
12-
// "forwardPorts": [],
13-
14-
"postStartCommand": "dockerd",
15-
16-
// privileged is required by GitHub codespaces - https://github.com/microsoft/vscode-dev-containers/issues/727
17-
"runArgs": [
18-
"--cap-add=SYS_PTRACE",
19-
"--security-opt",
20-
"seccomp=unconfined",
21-
"--privileged",
22-
"--init"
23-
]
3+
"image": "codercom/oss-dogfood:latest",
4+
5+
"features": {
6+
// See all possible options here https://github.com/devcontainers/features/tree/main/src/docker-in-docker
7+
"ghcr.io/devcontainers/features/docker-in-docker:2": {}
8+
},
9+
// SYS_PTRACE to enable go debugging
10+
// without --priviliged the Github Codespace build fails (not required otherwise)
11+
"runArgs": ["--cap-add=SYS_PTRACE", "--privileged"]
2412
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: |
44
inputs:
55
version:
66
description: "The Go version to use."
7-
default: "1.20.5"
7+
default: "1.20.6"
88
runs:
99
using: "composite"
1010
steps:
@@ -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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ 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:
9-
node-version: 16.16.0
10+
node-version: 16.20.1
1011
# See https://github.com/actions/setup-node#caching-global-packages-data
1112
cache: "yarn"
1213
cache-dependency-path: "site/yarn.lock"

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: "Setup Terraform"
2+
description: |
3+
Sets up Terraform for tests, builds, etc.
4+
runs:
5+
using: "composite"
6+
steps:
7+
- name: Install Terraform
8+
uses: hashicorp/setup-terraform@v2
9+
with:
10+
terraform_version: 1.5.2
11+
terraform_wrapper: false

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ runs:
2020
echo "No API key provided, skipping..."
2121
exit 0
2222
fi
23-
npm install -g @datadog/datadog-ci
23+
npm install -g @datadog/datadog-ci@2.10.0
2424
datadog-ci junit upload --service coder ./gotests.xml \
2525
--tags os:${{runner.os}} --tags runner_name:${{runner.name}}
2626
env:

‎.github/dependabot.yaml

Lines changed: 51 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ updates:
2424
update-types:
2525
- version-update:semver-minor
2626
- version-update:semver-patch
27+
groups:
28+
github-actions:
29+
patterns:
30+
- "*"
2731

2832
- package-ecosystem: "gomod"
2933
directory: "/"
@@ -39,6 +43,14 @@ updates:
3943
- dependency-name: "*"
4044
update-types:
4145
- version-update:semver-patch
46+
groups:
47+
otel:
48+
patterns:
49+
- "go.nhat.io/otelsql"
50+
- "go.opentelemetry.io/otel*"
51+
golang-x:
52+
patterns:
53+
- "golang.org/x/*"
4254

4355
# Update our Dockerfile.
4456
- package-ecosystem: "docker"
@@ -54,6 +66,10 @@ updates:
5466
# We need to coordinate terraform updates with the version hardcoded in
5567
# our Go code.
5668
- dependency-name: "terraform"
69+
groups:
70+
scripts-docker:
71+
patterns:
72+
- "*"
5773

5874
- package-ecosystem: "npm"
5975
directory: "/site/"
@@ -76,19 +92,36 @@ updates:
7692
- dependency-name: "@types/node"
7793
update-types:
7894
- version-update:semver-major
79-
80-
- package-ecosystem: "terraform"
81-
directory: "/examples/templates"
82-
schedule:
83-
interval: "monthly"
84-
time: "06:00"
85-
timezone: "America/Chicago"
86-
commit-message:
87-
prefix: "chore"
88-
labels: []
89-
ignore:
90-
# We likely want to update this ourselves.
91-
- dependency-name: "coder/coder"
95+
groups:
96+
react:
97+
patterns:
98+
- "react*"
99+
- "@types/react*"
100+
xterm:
101+
patterns:
102+
- "xterm*"
103+
xstate:
104+
patterns:
105+
- "xstate"
106+
- "@xstate*"
107+
mui:
108+
patterns:
109+
- "@mui*"
110+
storybook:
111+
patterns:
112+
- "@storybook*"
113+
- "storybook*"
114+
eslint:
115+
patterns:
116+
- "eslint*"
117+
- "@eslint*"
118+
- "@typescript-eslint/eslint-plugin"
119+
- "@typescript-eslint/parser"
120+
jest:
121+
patterns:
122+
- "jest*"
123+
- "@swc/jest"
124+
- "@types/jest"
92125

93126
# Update dogfood.
94127
- package-ecosystem: "docker"
@@ -100,6 +133,10 @@ updates:
100133
commit-message:
101134
prefix: "chore"
102135
labels: []
136+
groups:
137+
dogfood-docker:
138+
patterns:
139+
- "*"
103140

104141
- package-ecosystem: "terraform"
105142
directory: "/dogfood/"
@@ -111,4 +148,5 @@ updates:
111148
prefix: "chore"
112149
labels: []
113150
ignore:
151+
# We likely want to update this ourselves.
114152
- dependency-name: "coder/coder"

0 commit comments

Comments
 (0)