Skip to content

Commit de49cc1

Browse files
fix: FIx windows build (#549)
* fix: FIx windows build * chore: Update goreleaser & add to mise
1 parent b257304 commit de49cc1

File tree

5 files changed

+27
-3
lines changed

5 files changed

+27
-3
lines changed

.circleci/continue_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ jobs:
288288
command: |
289289
mkdir -p /tmp/goreleaser
290290
cd /tmp/goreleaser
291-
curl -L -o goreleaser.tgz https://github.com/goreleaser/goreleaser-pro/releases/download/v2.4.3-pro/goreleaser-pro_Linux_x86_64.tar.gz
291+
curl -L -o goreleaser.tgz https://github.com/goreleaser/goreleaser-pro/releases/download/v2.13.3-pro/goreleaser-pro_Linux_x86_64.tar.gz
292292
tar -xzvf goreleaser.tgz
293293
mv goreleaser /usr/local/bin/goreleaser
294294
- run:

mise.toml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,19 @@ asterisc = "1.3.0"
77
kontrol = "1.0.90"
88
binary_signer = "1.0.4"
99

10+
# Other tooling
11+
goreleaser-pro = "2.13.3"
12+
13+
1014
[alias]
1115
# These are disabled, but latest mise versions error if they don't have a known
1216
# install source even though it won't ever actually use that source.
1317
asterisc = "ubi:ethereum-optimism/fake-asterisc"
1418
kontrol = "ubi:ethereum-optimism/fake-kontrol"
1519
binary_signer = "ubi:ethereum-optimism/fake-binary_signer"
1620

21+
goreleaser-pro = "ubi:goreleaser/goreleaser-pro[exe=goreleaser]"
22+
1723

1824
[settings]
19-
disable_tools = ["asterisc", "kontrol", "binary_signer"]
25+
disable_tools = ["asterisc", "kontrol", "binary_signer"]

proxyd/backend_probe.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func probeDialer() *net.Dialer {
5656
dialer := &net.Dialer{
5757
Control: func(network, address string, c syscall.RawConn) error {
5858
return c.Control(func(fd uintptr) {
59-
_ = syscall.SetsockoptLinger(int(fd), syscall.SOL_SOCKET, syscall.SO_LINGER, &syscall.Linger{Onoff: 1, Linger: 1})
59+
_ = setSockOptLinger(int(fd), syscall.SOL_SOCKET, syscall.SO_LINGER, &syscall.Linger{Onoff: 1, Linger: 1})
6060
})
6161
},
6262
}

proxyd/backend_syscall.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
//go:build !windows
2+
3+
package proxyd
4+
5+
import "syscall"
6+
7+
func setSockOptLinger(fd int, level int, opt int, l *syscall.Linger) error {
8+
return syscall.SetsockoptLinger(fd, level, opt, l)
9+
}

proxyd/backend_syscall_windows.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
//go:build windows
2+
3+
package proxyd
4+
5+
import "syscall"
6+
7+
func setSockOptLinger(fd int, level int, opt int, l *syscall.Linger) error {
8+
return syscall.SetsockoptLinger(syscall.Handle(fd), level, opt, l)
9+
}

0 commit comments

Comments
 (0)