Skip to content

Commit 290409f

Browse files
ChandonPierreChandonPierre
authored
feat(ci): Bump to upstream v1.84.1 (#24)
https://tailscale.com/changelog#2025-05-21
2 parents 3161d60 + 1bbb41c commit 290409f

409 files changed

Lines changed: 29545 additions & 8123 deletions

File tree

Some content is hidden

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

‎.github/CONTRIBUTING.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
PRs welcome! But please file bugs first and explain the problem or
2+
motivation. For new or changed functionality, strike up a discussion
3+
and get agreement on the design/solution before spending too much time writing
4+
code.
5+
6+
Commit messages should [reference
7+
bugs](https://docs.github.com/en/github/writing-on-github/autolinked-references-and-urls).
8+
9+
We require [Developer Certificate of
10+
Origin](https://en.wikipedia.org/wiki/Developer_Certificate_of_Origin) (DCO)
11+
`Signed-off-by` lines in commits. (`git commit -s`)
12+
13+
Please squash your code review edits & force push. Multiple commits in
14+
a PR are fine, but only if they're each logically separate and all tests pass
15+
at each stage. No fixup commits.
16+
17+
See [commit-messages.md](docs/commit-messages.md) (or skim `git log`) for our commit message style.

‎.golangci.yml‎

Lines changed: 100 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,97 +1,110 @@
1+
version: "2"
2+
# Configuration for how we run golangci-lint
3+
# Timeout of 5m was the default in v1.
4+
run:
5+
timeout: 5m
16
linters:
27
# Don't enable any linters by default; just the ones that we explicitly
38
# enable in the list below.
4-
disable-all: true
9+
default: none
510
enable:
611
- bidichk
7-
- gofmt
8-
- goimports
912
- govet
1013
- misspell
1114
- revive
12-
13-
# Configuration for how we run golangci-lint
14-
run:
15-
timeout: 5m
16-
17-
issues:
18-
# Excluding configuration per-path, per-linter, per-text and per-source
19-
exclude-rules:
20-
# These are forks of an upstream package and thus are exempt from stylistic
21-
# changes that would make pulling in upstream changes harder.
22-
- path: tempfork/.*\.go
23-
text: "File is not `gofmt`-ed with `-s` `-r 'interface{} -> any'`"
24-
- path: util/singleflight/.*\.go
25-
text: "File is not `gofmt`-ed with `-s` `-r 'interface{} -> any'`"
26-
27-
# Per-linter settings are contained in this top-level key
28-
linters-settings:
29-
gofmt:
30-
rewrite-rules:
31-
- pattern: 'interface{}'
32-
replacement: 'any'
33-
34-
govet:
15+
settings:
3516
# Matches what we use in corp as of 2023-12-07
36-
enable:
37-
- asmdecl
38-
- assign
39-
- atomic
40-
- bools
41-
- buildtag
42-
- cgocall
43-
- copylocks
44-
- deepequalerrors
45-
- errorsas
46-
- framepointer
47-
- httpresponse
48-
- ifaceassert
49-
- loopclosure
50-
- lostcancel
51-
- nilfunc
52-
- nilness
53-
- printf
54-
- reflectvaluecompare
55-
- shift
56-
- sigchanyzer
57-
- sortslice
58-
- stdmethods
59-
- stringintconv
60-
- structtag
61-
- testinggoroutine
62-
- tests
63-
- unmarshal
64-
- unreachable
65-
- unsafeptr
66-
- unusedresult
67-
settings:
68-
printf:
69-
# List of print function names to check (in addition to default)
70-
funcs:
71-
- github.com/tailscale/tailscale/types/logger.Discard
72-
# NOTE(andrew-d): this doesn't currently work because the printf
73-
# analyzer doesn't support type declarations
74-
#- github.com/tailscale/tailscale/types/logger.Logf
75-
76-
revive:
77-
enable-all-rules: false
78-
ignore-generated-header: true
17+
govet:
18+
enable:
19+
- asmdecl
20+
- assign
21+
- atomic
22+
- bools
23+
- buildtag
24+
- cgocall
25+
- copylocks
26+
- deepequalerrors
27+
- errorsas
28+
- framepointer
29+
- httpresponse
30+
- ifaceassert
31+
- loopclosure
32+
- lostcancel
33+
- nilfunc
34+
- nilness
35+
- printf
36+
- reflectvaluecompare
37+
- shift
38+
- sigchanyzer
39+
- sortslice
40+
- stdmethods
41+
- stringintconv
42+
- structtag
43+
- testinggoroutine
44+
- tests
45+
- unmarshal
46+
- unreachable
47+
- unsafeptr
48+
- unusedresult
49+
settings:
50+
printf:
51+
# List of print function names to check (in addition to default)
52+
funcs:
53+
- github.com/tailscale/tailscale/types/logger.Discard
54+
# NOTE(andrew-d): this doesn't currently work because the printf
55+
# analyzer doesn't support type declarations
56+
#- github.com/tailscale/tailscale/types/logger.Logf
57+
revive:
58+
enable-all-rules: false
59+
rules:
60+
- name: atomic
61+
- name: context-keys-type
62+
- name: defer
63+
arguments: [[
64+
# Calling 'recover' at the time a defer is registered (i.e. "defer recover()") has no effect.
65+
"immediate-recover",
66+
# Calling 'recover' outside of a deferred function has no effect
67+
"recover",
68+
# Returning values from a deferred function has no effect
69+
"return",
70+
]]
71+
- name: duplicated-imports
72+
- name: errorf
73+
- name: string-of-int
74+
- name: time-equal
75+
- name: unconditional-recursion
76+
- name: useless-break
77+
- name: waitgroup-by-value
78+
exclusions:
79+
generated: lax
80+
presets:
81+
- comments
82+
- common-false-positives
83+
- legacy
84+
- std-error-handling
7985
rules:
80-
- name: atomic
81-
- name: context-keys-type
82-
- name: defer
83-
arguments: [[
84-
# Calling 'recover' at the time a defer is registered (i.e. "defer recover()") has no effect.
85-
"immediate-recover",
86-
# Calling 'recover' outside of a deferred function has no effect
87-
"recover",
88-
# Returning values from a deferred function has no effect
89-
"return",
90-
]]
91-
- name: duplicated-imports
92-
- name: errorf
93-
- name: string-of-int
94-
- name: time-equal
95-
- name: unconditional-recursion
96-
- name: useless-break
97-
- name: waitgroup-by-value
86+
# These are forks of an upstream package and thus are exempt from stylistic
87+
# changes that would make pulling in upstream changes harder.
88+
- path: tempfork/.*\.go
89+
text: File is not `gofmt`-ed with `-s` `-r 'interface{} -> any'`
90+
- path: util/singleflight/.*\.go
91+
text: File is not `gofmt`-ed with `-s` `-r 'interface{} -> any'`
92+
paths:
93+
- third_party$
94+
- builtin$
95+
- examples$
96+
formatters:
97+
enable:
98+
- gofmt
99+
- goimports
100+
settings:
101+
gofmt:
102+
rewrite-rules:
103+
- pattern: interface{}
104+
replacement: any
105+
exclusions:
106+
generated: lax
107+
paths:
108+
- third_party$
109+
- builtin$
110+
- examples$

‎Makefile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ updatedeps: ## Update depaware deps
2323
tailscale.com/cmd/derper \
2424
tailscale.com/cmd/k8s-operator \
2525
tailscale.com/cmd/stund
26+
PATH="$$(./tool/go env GOROOT)/bin:$$PATH" ./tool/go run github.com/tailscale/depaware --update -goos=linux,darwin,windows,android,ios --internal \
27+
tailscale.com/tsnet
2628

2729
depaware: ## Run depaware checks
2830
# depaware (via x/tools/go/packages) shells back to "go", so make sure the "go"
@@ -33,6 +35,8 @@ depaware: ## Run depaware checks
3335
tailscale.com/cmd/derper \
3436
tailscale.com/cmd/k8s-operator \
3537
tailscale.com/cmd/stund
38+
PATH="$$(./tool/go env GOROOT)/bin:$$PATH" ./tool/go run github.com/tailscale/depaware --check --goos=linux,darwin,windows,android,ios --internal \
39+
tailscale.com/tsnet
3640

3741
buildwindows: ## Build tailscale CLI for windows/amd64
3842
GOOS=windows GOARCH=amd64 ./tool/go install tailscale.com/cmd/tailscale tailscale.com/cmd/tailscaled

‎README.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,7 @@ We require [Developer Certificate of
7171
Origin](https://en.wikipedia.org/wiki/Developer_Certificate_of_Origin)
7272
`Signed-off-by` lines in commits.
7373

74-
See `git log` for our commit message style. It's basically the same as
75-
[Go's style](https://go.dev/wiki/CommitMessage).
74+
See [commit-messages.md](docs/commit-messages.md) (or skim `git log`) for our commit message style.
7675

7776
## About Us
7877

‎VERSION.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.82.5
1+
1.84.1

‎build_dist.sh‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,26 @@ EOF
2828
exit 0
2929
fi
3030

31-
tags=""
31+
tags="${TAGS:-}"
3232
ldflags="-X tailscale.com/version.longStamp=${VERSION_LONG} -X tailscale.com/version.shortStamp=${VERSION_SHORT}"
3333

3434
# build_dist.sh arguments must precede go build arguments.
3535
while [ "$#" -gt 1 ]; do
3636
case "$1" in
3737
--extra-small)
38+
if [ ! -z "${TAGS:-}" ]; then
39+
echo "set either --extra-small or \$TAGS, but not both"
40+
exit 1
41+
fi
3842
shift
3943
ldflags="$ldflags -w -s"
40-
tags="${tags:+$tags,}ts_omit_aws,ts_omit_bird,ts_omit_tap,ts_omit_kube,ts_omit_completion,ts_omit_ssh,ts_omit_wakeonlan,ts_omit_capture"
44+
tags="${tags:+$tags,}ts_omit_aws,ts_omit_bird,ts_omit_tap,ts_omit_kube,ts_omit_completion,ts_omit_ssh,ts_omit_wakeonlan,ts_omit_capture,ts_omit_relayserver,ts_omit_taildrop,ts_omit_tpm"
4145
;;
4246
--box)
47+
if [ ! -z "${TAGS:-}" ]; then
48+
echo "set either --box or \$TAGS, but not both"
49+
exit 1
50+
fi
4351
shift
4452
tags="${tags:+$tags,}ts_include_cli"
4553
;;

0 commit comments

Comments
 (0)