Skip to content

Commit cba8e83

Browse files
committed
Merge branch 'closestun' into forcehttp
2 parents 6bb3c86 + e074cdd commit cba8e83

File tree

339 files changed

+13032
-3116
lines changed

Some content is hidden

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

339 files changed

+13032
-3116
lines changed

.github/workflows/cross-darwin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Set up Go
2020
uses: actions/setup-go@v3
2121
with:
22-
go-version: 1.18
22+
go-version: 1.19
2323
id: go
2424

2525
- name: Check out code into the Go module directory

.github/workflows/cross-freebsd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Set up Go
2020
uses: actions/setup-go@v3
2121
with:
22-
go-version: 1.18
22+
go-version: 1.19
2323
id: go
2424

2525
- name: Check out code into the Go module directory

.github/workflows/cross-openbsd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Set up Go
2020
uses: actions/setup-go@v3
2121
with:
22-
go-version: 1.18
22+
go-version: 1.19
2323
id: go
2424

2525
- name: Check out code into the Go module directory

.github/workflows/cross-wasm.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,22 @@ jobs:
1919
- name: Set up Go
2020
uses: actions/setup-go@v3
2121
with:
22-
go-version: 1.18
22+
go-version: 1.19
2323
id: go
2424

2525
- name: Check out code into the Go module directory
2626
uses: actions/checkout@v3
2727

28-
- name: Wasm build CLI and client modules
28+
- name: Wasm client build
2929
env:
3030
GOOS: js
3131
GOARCH: wasm
32-
run: go build ./cmd/tailscale/cli ./ipn/... ./net/... ./safesocket ./types/... ./wgengine/...
32+
run: go build ./cmd/tsconnect/wasm
33+
34+
- name: tsconnect static build
35+
# Use our custom Go toolchain, we set build tags (to control binary size)
36+
# that depend on it.
37+
run: ./tool/go run ./cmd/tsconnect build
3338

3439
- uses: k0kubun/action-slack@v2.0.0
3540
with:

.github/workflows/cross-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Set up Go
2020
uses: actions/setup-go@v3
2121
with:
22-
go-version: 1.18
22+
go-version: 1.19
2323
id: go
2424

2525
- name: Check out code into the Go module directory

.github/workflows/depaware.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Set up Go
1717
uses: actions/setup-go@v3
1818
with:
19-
go-version: 1.18
19+
go-version: 1.19
2020

2121
- name: Check out code
2222
uses: actions/checkout@v3

.github/workflows/go_generate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Set up Go
1818
uses: actions/setup-go@v3
1919
with:
20-
go-version: 1.18
20+
go-version: 1.19
2121

2222
- name: Check out code
2323
uses: actions/checkout@v3

.github/workflows/license.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Set up Go
1717
uses: actions/setup-go@v3
1818
with:
19-
go-version: 1.18
19+
go-version: 1.19
2020

2121
- name: Check out code
2222
uses: actions/checkout@v3

.github/workflows/linux-race.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Set up Go
2020
uses: actions/setup-go@v3
2121
with:
22-
go-version: 1.18
22+
go-version: 1.19
2323
id: go
2424

2525
- name: Check out code into the Go module directory

.github/workflows/linux.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Set up Go
2020
uses: actions/setup-go@v3
2121
with:
22-
go-version: 1.18
22+
go-version: 1.19
2323
id: go
2424

2525
- name: Check out code into the Go module directory
@@ -28,6 +28,11 @@ jobs:
2828
- name: Basic build
2929
run: go build ./cmd/...
3030

31+
- name: Build variants
32+
run: |
33+
go install --tags=ts_include_cli ./cmd/tailscaled
34+
go install --tags=ts_omit_aws ./cmd/tailscaled
35+
3136
- name: Get QEMU
3237
run: |
3338
# The qemu in Ubuntu 20.04 (Focal) is too old; we need 5.x something

0 commit comments

Comments
 (0)