Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc210e8d

Browse files
committed
Merge remote-tracking branch 'origin/main' into stevenmasley/proxy_latency_pick
2 parentsa3703e1 +63a9e34 commitc210e8d

File tree

163 files changed

+3416
-1547
lines changed

Some content is hidden

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

163 files changed

+3416
-1547
lines changed

‎.github/dependabot.yaml‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ updates:
33
-package-ecosystem:"github-actions"
44
directory:"/"
55
schedule:
6-
interval:"monthly"
6+
interval:"weekly"
77
time:"06:00"
88
timezone:"America/Chicago"
99
labels:[]
@@ -28,7 +28,7 @@ updates:
2828
-package-ecosystem:"gomod"
2929
directory:"/"
3030
schedule:
31-
interval:"monthly"
31+
interval:"weekly"
3232
time:"06:00"
3333
timezone:"America/Chicago"
3434
commit-message:
@@ -40,6 +40,18 @@ updates:
4040
update-types:
4141
-version-update:semver-patch
4242

43+
# Update our Dockerfile.
44+
-package-ecosystem:"docker"
45+
directory:"/scripts/"
46+
schedule:
47+
interval:"weekly"
48+
time:"06:00"
49+
timezone:"America/Chicago"
50+
ignore:
51+
# We need to coordinate terraform updates with the version hardcoded in
52+
# our Go code.
53+
-dependency-name:"terraform"
54+
4355
-package-ecosystem:"npm"
4456
directory:"/site/"
4557
schedule:

‎.github/workflows/ci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141

4242
# Check for any typos!
4343
-name:Check for typos
44-
uses:crate-ci/typos@v1.14.8
44+
uses:crate-ci/typos@v1.14.9
4545
with:
4646
config:.github/workflows/typos.toml
4747
-name:Fix the typos

‎.github/workflows/dogfood.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ on:
66
-main
77
paths:
88
-"dogfood/**"
9-
pull_request:
10-
paths:
11-
-"dogfood/**"
9+
# Uncomment these lines when testing with CI.
10+
# pull_request:
11+
# paths:
12+
# - "dogfood/**"
1213
workflow_dispatch:
1314

1415
jobs:

‎.github/workflows/security.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ jobs:
163163
-name:Send Slack notification on failure
164164
if:${{ failure() }}
165165
run:|
166-
msg="❌CodeQL Failed\n\nhttps://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
166+
msg="❌Trivy Failed\n\nhttps://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
167167
curl \
168168
-qfsSL \
169169
-X POST \

‎.github/workflows/stale.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
-name:Checkout repository
3939
uses:actions/checkout@v2
4040
-name:Run delete-old-branches-action
41-
uses:beatlabs/delete-old-branches-action@v0.0.9
41+
uses:beatlabs/delete-old-branches-action@v0.0.10
4242
with:
4343
repo_token:${{ github.token }}
4444
date:"6 months ago"

‎.gitignore‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,14 @@ site/stats/
4848
*.lock.hcl
4949
.terraform/
5050

51-
/.coderv2/*
51+
**/.coderv2/*
5252
**/__debug_bin
5353

5454
# direnv
5555
.envrc
5656
*.test
57+
58+
# Loadtesting
59+
./scaletest/terraform/.terraform
60+
./scaletest/terraform/.terraform.lock.hcl
61+
terraform.tfstate.*

‎.prettierignore‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,17 @@ site/stats/
5151
*.lock.hcl
5252
.terraform/
5353

54-
/.coderv2/*
54+
**/.coderv2/*
5555
**/__debug_bin
5656

5757
# direnv
5858
.envrc
5959
*.test
60+
61+
# Loadtesting
62+
./scaletest/terraform/.terraform
63+
./scaletest/terraform/.terraform.lock.hcl
64+
terraform.tfstate.*
6065
# .prettierignore.include:
6166
# Helm templates contain variables that are invalid YAML and can't be formatted
6267
# by Prettier.

‎Makefile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,7 @@ site/.eslintignore site/.prettierignore: .prettierignore Makefile
595595
done<"$<"
596596

597597
test: test-clean
598-
gotestsum -- -v -short ./...
598+
gotestsum --format standard-quiet -- -v -short ./...
599599
.PHONY: test
600600

601601
# When updating -timeout for this test, keep in sync with
@@ -608,9 +608,8 @@ test-postgres: test-clean test-postgres-docker
608608
--jsonfile="gotests.json"\
609609
--packages="./..." --\
610610
-covermode=atomic -coverprofile="gotests.coverage" -timeout=20m\
611-
-parallel=4\
612611
-coverpkg=./...\
613-
-count=1 -race -failfast
612+
-race -failfast
614613
.PHONY: test-postgres
615614

616615
test-postgres-docker:
@@ -627,6 +626,8 @@ test-postgres-docker:
627626
--detach\
628627
postgres:13\
629628
-c shared_buffers=1GB\
629+
-c work_mem=1GB\
630+
-c effective_cache_size=1GB\
630631
-c max_connections=1000\
631632
-c fsync=off\
632633
-c synchronous_commit=off\

‎agent/agent.go‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ type Options struct {
6262
IgnorePortsmap[int]string
6363
SSHMaxTimeout time.Duration
6464
TailnetListenPortuint16
65+
Subsystem codersdk.AgentSubsystem
6566
}
6667

6768
typeClientinterface {
@@ -119,6 +120,7 @@ func New(options Options) Agent {
119120
ignorePorts:options.IgnorePorts,
120121
connStatsChan:make(chan*agentsdk.Stats,1),
121122
sshMaxTimeout:options.SSHMaxTimeout,
123+
subsystem:options.Subsystem,
122124
}
123125
a.init(ctx)
124126
returna
@@ -136,6 +138,7 @@ type agent struct {
136138
// listing all listening ports. This is helpful to hide ports that
137139
// are used by the agent, that the user does not care about.
138140
ignorePortsmap[int]string
141+
subsystem codersdk.AgentSubsystem
139142

140143
reconnectingPTYs sync.Map
141144
reconnectingPTYTimeout time.Duration
@@ -488,6 +491,7 @@ func (a *agent) run(ctx context.Context) error {
488491
err=a.client.PostStartup(ctx, agentsdk.PostStartupRequest{
489492
Version:buildinfo.Version(),
490493
ExpandedDirectory:manifest.Directory,
494+
Subsystem:a.subsystem,
491495
})
492496
iferr!=nil {
493497
returnxerrors.Errorf("update workspace agent version: %w",err)
@@ -1455,3 +1459,8 @@ func expandDirectory(dir string) (string, error) {
14551459
}
14561460
returndir,nil
14571461
}
1462+
1463+
// EnvAgentSubsystem is the environment variable used to denote the
1464+
// specialized environment in which the agent is running
1465+
// (e.g. envbox, envbuilder).
1466+
constEnvAgentSubsystem="CODER_AGENT_SUBSYSTEM"

‎agent/agent_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1020,7 +1020,7 @@ func TestAgentMetadata_Timing(t *testing.T) {
10201020
ifruntime.GOOS=="windows" {
10211021
// Shell scripting in Windows is a pain, and we have already tested
10221022
// that the OS logic works in the simpler tests.
1023-
t.Skip()
1023+
t.SkipNow()
10241024
}
10251025
testutil.SkipIfNotTiming(t)
10261026
t.Parallel()

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp