Skip to content

Commit 3daa7f1

Browse files
kylecarbskylecarbs
authored
Merge branch 'tailscale:main' into forcehttp
2 parents cba8e83 + 70ed22c commit 3daa7f1

File tree

237 files changed

+9257
-3194
lines changed

Some content is hidden

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

237 files changed

+9257
-3194
lines changed

‎.github/licenses.tmpl

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Tailscale CLI and daemon dependencies
2+
3+
The following open source dependencies are used to build the [tailscale][] and
4+
[tailscaled][] commands. These are primarily used on Linux and BSD variants as
5+
well as an [option for macOS][].
6+
7+
[tailscale]: https://pkg.go.dev/tailscale.com/cmd/tailscale
8+
[tailscaled]: https://pkg.go.dev/tailscale.com/cmd/tailscaled
9+
[option for macOS]: https://tailscale.com/kb/1065/macos-variants/
10+
11+
## Go Packages
12+
13+
Some packages may only be included on certain architectures or operating systems.
14+
15+
{{ range . }}
16+
- [{{.Name}}](https://pkg.go.dev/{{.Name}}) ([{{.LicenseName}}]({{.LicenseURL}}))
17+
{{- end }}

‎.github/workflows/cifuzz.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
name: CIFuzz
22
on: [pull_request]
3+
4+
concurrency:
5+
group: ${{ github.workflow }}-$${{ github.head_ref || github.run_id }}
6+
cancel-in-progress: true
7+
38
jobs:
49
Fuzzing:
510
runs-on: ubuntu-latest

‎.github/workflows/codeql-analysis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ on:
2020
schedule:
2121
- cron: '31 14 * * 5'
2222

23+
concurrency:
24+
group: ${{ github.workflow }}-$${{ github.head_ref || github.run_id }}
25+
cancel-in-progress: true
26+
2327
jobs:
2428
analyze:
2529
name: Analyze

‎.github/workflows/cross-darwin.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,26 @@ on:
88
branches:
99
- '*'
1010

11+
concurrency:
12+
group: ${{ github.workflow }}-$${{ github.head_ref || github.run_id }}
13+
cancel-in-progress: true
14+
1115
jobs:
1216
build:
1317
runs-on: ubuntu-latest
1418

1519
if: "!contains(github.event.head_commit.message, '[ci skip]')"
1620

1721
steps:
22+
- name: Check out code into the Go module directory
23+
uses: actions/checkout@v3
1824

1925
- name: Set up Go
2026
uses: actions/setup-go@v3
2127
with:
22-
go-version: 1.19
28+
go-version-file: go.mod
2329
id: go
2430

25-
- name: Check out code into the Go module directory
26-
uses: actions/checkout@v3
27-
2831
- name: macOS build cmd
2932
env:
3033
GOOS: darwin

‎.github/workflows/cross-freebsd.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,26 @@ on:
88
branches:
99
- '*'
1010

11+
concurrency:
12+
group: ${{ github.workflow }}-$${{ github.head_ref || github.run_id }}
13+
cancel-in-progress: true
14+
1115
jobs:
1216
build:
1317
runs-on: ubuntu-latest
1418

1519
if: "!contains(github.event.head_commit.message, '[ci skip]')"
1620

1721
steps:
22+
- name: Check out code into the Go module directory
23+
uses: actions/checkout@v3
1824

1925
- name: Set up Go
2026
uses: actions/setup-go@v3
2127
with:
22-
go-version: 1.19
28+
go-version-file: go.mod
2329
id: go
2430

25-
- name: Check out code into the Go module directory
26-
uses: actions/checkout@v3
27-
2831
- name: FreeBSD build cmd
2932
env:
3033
GOOS: freebsd

‎.github/workflows/cross-openbsd.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,26 @@ on:
88
branches:
99
- '*'
1010

11+
concurrency:
12+
group: ${{ github.workflow }}-$${{ github.head_ref || github.run_id }}
13+
cancel-in-progress: true
14+
1115
jobs:
1216
build:
1317
runs-on: ubuntu-latest
1418

1519
if: "!contains(github.event.head_commit.message, '[ci skip]')"
1620

1721
steps:
22+
- name: Check out code into the Go module directory
23+
uses: actions/checkout@v3
1824

1925
- name: Set up Go
2026
uses: actions/setup-go@v3
2127
with:
22-
go-version: 1.19
28+
go-version-file: go.mod
2329
id: go
2430

25-
- name: Check out code into the Go module directory
26-
uses: actions/checkout@v3
27-
2831
- name: OpenBSD build cmd
2932
env:
3033
GOOS: openbsd

‎.github/workflows/cross-wasm.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,38 @@ on:
88
branches:
99
- '*'
1010

11+
concurrency:
12+
group: ${{ github.workflow }}-$${{ github.head_ref || github.run_id }}
13+
cancel-in-progress: true
14+
1115
jobs:
1216
build:
1317
runs-on: ubuntu-latest
1418

1519
if: "!contains(github.event.head_commit.message, '[ci skip]')"
1620

1721
steps:
22+
- name: Check out code into the Go module directory
23+
uses: actions/checkout@v3
1824

1925
- name: Set up Go
2026
uses: actions/setup-go@v3
2127
with:
22-
go-version: 1.19
28+
go-version-file: go.mod
2329
id: go
2430

25-
- name: Check out code into the Go module directory
26-
uses: actions/checkout@v3
27-
2831
- name: Wasm client build
2932
env:
3033
GOOS: js
3134
GOARCH: wasm
32-
run: go build ./cmd/tsconnect/wasm
35+
run: go build ./cmd/tsconnect/wasm ./cmd/tailscale/cli
3336

3437
- name: tsconnect static build
3538
# Use our custom Go toolchain, we set build tags (to control binary size)
3639
# that depend on it.
37-
run: ./tool/go run ./cmd/tsconnect build
40+
run: |
41+
./tool/go run ./cmd/tsconnect --fast-compression build
42+
./tool/go run ./cmd/tsconnect build-pkg
3843
3944
- uses: k0kubun/action-slack@v2.0.0
4045
with:

‎.github/workflows/cross-windows.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,26 @@ on:
88
branches:
99
- '*'
1010

11+
concurrency:
12+
group: ${{ github.workflow }}-$${{ github.head_ref || github.run_id }}
13+
cancel-in-progress: true
14+
1115
jobs:
1216
build:
1317
runs-on: ubuntu-latest
1418

1519
if: "!contains(github.event.head_commit.message, '[ci skip]')"
1620

1721
steps:
22+
- name: Check out code into the Go module directory
23+
uses: actions/checkout@v3
1824

1925
- name: Set up Go
2026
uses: actions/setup-go@v3
2127
with:
22-
go-version: 1.19
28+
go-version-file: go.mod
2329
id: go
2430

25-
- name: Check out code into the Go module directory
26-
uses: actions/checkout@v3
27-
2831
- name: Windows build cmd
2932
env:
3033
GOOS: windows

‎.github/workflows/depaware.yml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,25 @@ on:
88
branches:
99
- '*'
1010

11+
concurrency:
12+
group: ${{ github.workflow }}-$${{ github.head_ref || github.run_id }}
13+
cancel-in-progress: true
14+
1115
jobs:
1216
build:
1317
runs-on: ubuntu-latest
1418

1519
steps:
16-
- name: Set up Go
17-
uses: actions/setup-go@v3
18-
with:
19-
go-version: 1.19
20-
2120
- name: Check out code
2221
uses: actions/checkout@v3
2322

24-
- name: depaware tailscaled
25-
run: go run github.com/tailscale/depaware --check tailscale.com/cmd/tailscaled
23+
- name: Set up Go
24+
uses: actions/setup-go@v3
25+
with:
26+
go-version-file: go.mod
2627

27-
- name: depaware tailscale
28-
run: go run github.com/tailscale/depaware --check tailscale.com/cmd/tailscale
28+
- name: depaware
29+
run: go run github.com/tailscale/depaware --check
30+
tailscale.com/cmd/tailscaled
31+
tailscale.com/cmd/tailscale
32+
tailscale.com/cmd/derper

‎.github/workflows/go-licenses.yml

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
name: go-licenses
2+
3+
on:
4+
# run action when a change lands in the main branch which updates go.mod or
5+
# our license template file. Also allow manual triggering.
6+
push:
7+
branches:
8+
- main
9+
paths:
10+
- go.mod
11+
- .github/licenses.tmpl
12+
- .github/workflows/go-licenses.yml
13+
workflow_dispatch:
14+
15+
concurrency:
16+
group: ${{ github.workflow }}-$${{ github.head_ref || github.run_id }}
17+
cancel-in-progress: true
18+
19+
jobs:
20+
tailscale:
21+
runs-on: ubuntu-latest
22+
23+
steps:
24+
- name: Check out code
25+
uses: actions/checkout@v3
26+
27+
- name: Set up Go
28+
uses: actions/setup-go@v3
29+
with:
30+
go-version-file: go.mod
31+
32+
- name: Install go-licenses
33+
run: |
34+
go install github.com/google/go-licenses@v1.2.2-0.20220825154955-5eedde1c6584
35+
36+
- name: Run go-licenses
37+
env:
38+
# include all build tags to include platform-specific dependencies
39+
GOFLAGS: "-tags=android,cgo,darwin,freebsd,ios,js,linux,openbsd,wasm,windows"
40+
run: |
41+
[ -d licenses ] || mkdir licenses
42+
go-licenses report tailscale.com/cmd/tailscale tailscale.com/cmd/tailscaled > licenses/tailscale.md --template .github/licenses.tmpl
43+
44+
- name: Get access token
45+
uses: tibdex/github-app-token@f717b5ecd4534d3c4df4ce9b5c1c2214f0f7cd06 # v1.6.0
46+
id: generate-token
47+
with:
48+
app_id: ${{ secrets.LICENSING_APP_ID }}
49+
installation_id: ${{ secrets.LICENSING_APP_INSTALLATION_ID }}
50+
private_key: ${{ secrets.LICENSING_APP_PRIVATE_KEY }}
51+
52+
- name: Send pull request
53+
uses: peter-evans/create-pull-request@18f90432bedd2afd6a825469ffd38aa24712a91d #v4.1.1
54+
with:
55+
token: ${{ steps.generate-token.outputs.token }}
56+
author: License Updater <noreply@tailscale.com>
57+
committer: License Updater <noreply@tailscale.com>
58+
branch: licenses/cli
59+
commit-message: "licenses: update tailscale{,d} licenses"
60+
title: "licenses: update tailscale{,d} licenses"
61+
body: Triggered by ${{ github.repository }}@${{ github.sha }}
62+
signoff: true
63+
delete-branch: true
64+
team-reviewers: opensource-license-reviewers

‎.github/workflows/go_generate.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,25 @@ on:
99
branches:
1010
- "*"
1111

12+
concurrency:
13+
group: ${{ github.workflow }}-$${{ github.head_ref || github.run_id }}
14+
cancel-in-progress: true
15+
1216
jobs:
1317
check:
1418
runs-on: ubuntu-latest
1519

1620
steps:
17-
- name: Set up Go
18-
uses: actions/setup-go@v3
19-
with:
20-
go-version: 1.19
21-
2221
- name: Check out code
2322
uses: actions/checkout@v3
2423
with:
2524
fetch-depth: 0
2625

26+
- name: Set up Go
27+
uses: actions/setup-go@v3
28+
with:
29+
go-version-file: go.mod
30+
2731
- name: check 'go generate' is clean
2832
run: |
2933
if [[ "${{github.ref}}" == release-branch/* ]]

‎.github/workflows/go_mod_tidy.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: go mod tidy
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
branches:
9+
- "*"
10+
11+
concurrency:
12+
group: ${{ github.workflow }}-$${{ github.head_ref || github.run_id }}
13+
cancel-in-progress: true
14+
15+
jobs:
16+
check:
17+
runs-on: ubuntu-latest
18+
19+
steps:
20+
- name: Check out code
21+
uses: actions/checkout@v3
22+
with:
23+
fetch-depth: 0
24+
25+
- name: Set up Go
26+
uses: actions/setup-go@v3
27+
with:
28+
go-version-file: go.mod
29+
30+
- name: check 'go mod tidy' is clean
31+
run: |
32+
go mod tidy
33+
echo
34+
echo
35+
git diff --name-only --exit-code || (echo "Please run 'go mod tidy'."; exit 1)

0 commit comments

Comments
 (0)