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

Commit5c1392b

Browse files
committed
Merge branch 'main' into jetbrains-offline-mode
2 parents0f2f539 +35d0809 commit5c1392b

File tree

67 files changed

+2569
-1104
lines changed

Some content is hidden

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

67 files changed

+2569
-1104
lines changed

‎.github/dependabot.yaml

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ updates:
88
timezone:"America/Chicago"
99
labels:[]
1010
commit-message:
11-
prefix:"chore"
11+
prefix:"ci"
1212
ignore:
1313
# These actions deliver the latest versions by updating the major
1414
# release tag, so ignore minor and patch versions
@@ -117,11 +117,6 @@ updates:
117117
-"@eslint*"
118118
-"@typescript-eslint/eslint-plugin"
119119
-"@typescript-eslint/parser"
120-
jest:
121-
patterns:
122-
-"jest*"
123-
-"@swc/jest"
124-
-"@types/jest"
125120

126121
-package-ecosystem:"npm"
127122
directory:"/offlinedocs/"
@@ -146,20 +141,6 @@ updates:
146141
-version-update:semver-major
147142

148143
# Update dogfood.
149-
-package-ecosystem:"docker"
150-
directory:"/dogfood/"
151-
schedule:
152-
interval:"weekly"
153-
time:"06:00"
154-
timezone:"America/Chicago"
155-
commit-message:
156-
prefix:"chore"
157-
labels:[]
158-
groups:
159-
dogfood-docker:
160-
patterns:
161-
-"*"
162-
163144
-package-ecosystem:"terraform"
164145
directory:"/dogfood/"
165146
schedule:

‎.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ jobs:
137137
138138
# Check for any typos
139139
-name:Check for typos
140-
uses:crate-ci/typos@v1.16.6
140+
uses:crate-ci/typos@v1.16.8
141141
with:
142142
config:.github/workflows/typos.toml
143143

‎.github/workflows/pr-cleanup.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name:Cleanup PR deployment and image
1+
name:pr-cleanup
22
on:
33
pull_request:
44
types:closed
@@ -35,14 +35,14 @@ jobs:
3535

3636
-name:Set up kubeconfig
3737
run:|
38-
set -euxo pipefail
38+
set -euo pipefail
3939
mkdir -p ~/.kube
4040
echo "${{ secrets.PR_DEPLOYMENTS_KUBECONFIG }}" > ~/.kube/config
4141
export KUBECONFIG=~/.kube/config
4242
4343
-name:Delete helm release
4444
run:|
45-
set -euxo pipefail
45+
set -euo pipefail
4646
helm delete --namespace "pr${{ steps.pr_number.outputs.PR_NUMBER }}" "pr${{ steps.pr_number.outputs.PR_NUMBER }}" || echo "helm release not found"
4747
4848
-name:"Remove PR namespace"
@@ -51,7 +51,7 @@ jobs:
5151
5252
-name:"Remove DNS records"
5353
run:|
54-
set -euxo pipefail
54+
set -euo pipefail
5555
# Get identifier for the record
5656
record_id=$(curl -X GET "https://api.cloudflare.com/client/v4/zones/${{ secrets.PR_DEPLOYMENTS_ZONE_ID }}/dns_records?name=%2A.pr${{ steps.pr_number.outputs.PR_NUMBER }}.${{ secrets.PR_DEPLOYMENTS_DOMAIN }}" \
5757
-H "Authorization: Bearer ${{ secrets.PR_DEPLOYMENTS_CLOUDFLARE_API_TOKEN }}" \

‎.golangci.yaml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,16 @@
22
# Over time we should try tightening some of these.
33

44
linters-settings:
5+
dupl:
6+
# goal: 100
7+
threshold:412
8+
59
exhaustruct:
610
include:
711
# Gradually extend to cover more of the codebase.
812
-'httpmw\.\w+'
913
gocognit:
10-
min-complexity:46# Min code complexity (def 30).
14+
min-complexity:300
1115

1216
goconst:
1317
min-len:4# Min length of string consts (def 3).
@@ -118,10 +122,6 @@ linters-settings:
118122
goimports:
119123
local-prefixes:coder.com,cdr.dev,go.coder.com,github.com/cdr,github.com/coder
120124

121-
gocyclo:
122-
# goal: 30
123-
min-complexity:47
124-
125125
importas:
126126
no-unaliased:true
127127

@@ -232,7 +232,11 @@ linters:
232232
-exportloopref
233233
-forcetypeassert
234234
-gocritic
235-
-gocyclo
235+
# gocyclo is may be useful in the future when we start caring
236+
# about testing complexity, but for the time being we should
237+
# create a good culture around cognitive complexity.
238+
# - gocyclo
239+
-gocognit
236240
-goimports
237241
-gomodguard
238242
-gosec
@@ -268,3 +272,4 @@ linters:
268272
-typecheck
269273
-unconvert
270274
-unused
275+
-dupl

‎cli/configssh.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,6 @@ func sshPrepareWorkspaceConfigs(ctx context.Context, client *codersdk.Client) (r
190190
}
191191
}
192192

193-
//nolint:gocyclo
194193
func (r*RootCmd)configSSH()*clibase.Cmd {
195194
var (
196195
sshConfigFilestring

‎cli/root.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -831,6 +831,13 @@ func (r *RootCmd) checkWarnings(i *clibase.Invocation, client *codersdk.Client)
831831
returnnil
832832
}
833833

834+
// Verbosef logs a message if verbose mode is enabled.
835+
func (r*RootCmd)Verbosef(inv*clibase.Invocation,fmtStrstring,args...interface{}) {
836+
ifr.verbose {
837+
cliui.Infof(inv.Stdout,fmtStr,args...)
838+
}
839+
}
840+
834841
typeheaderTransportstruct {
835842
transport http.RoundTripper
836843
header http.Header

0 commit comments

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