diff --git a/.circleci/continue_config.yml b/.circleci/continue_config.yml index 84b1c5e3..4128feeb 100644 --- a/.circleci/continue_config.yml +++ b/.circleci/continue_config.yml @@ -288,7 +288,7 @@ jobs: command: | mkdir -p /tmp/goreleaser cd /tmp/goreleaser - curl -L -o goreleaser.tgz https://github.com/goreleaser/goreleaser-pro/releases/download/v2.4.3-pro/goreleaser-pro_Linux_x86_64.tar.gz + curl -L -o goreleaser.tgz https://github.com/goreleaser/goreleaser-pro/releases/download/v2.13.3-pro/goreleaser-pro_Linux_x86_64.tar.gz tar -xzvf goreleaser.tgz mv goreleaser /usr/local/bin/goreleaser - run: diff --git a/mise.toml b/mise.toml index 38b12dce..0f7bcf95 100644 --- a/mise.toml +++ b/mise.toml @@ -7,6 +7,10 @@ asterisc = "1.3.0" kontrol = "1.0.90" binary_signer = "1.0.4" +# Other tooling +goreleaser-pro = "2.13.3" + + [alias] # These are disabled, but latest mise versions error if they don't have a known # install source even though it won't ever actually use that source. @@ -14,6 +18,8 @@ asterisc = "ubi:ethereum-optimism/fake-asterisc" kontrol = "ubi:ethereum-optimism/fake-kontrol" binary_signer = "ubi:ethereum-optimism/fake-binary_signer" +goreleaser-pro = "ubi:goreleaser/goreleaser-pro[exe=goreleaser]" + [settings] -disable_tools = ["asterisc", "kontrol", "binary_signer"] \ No newline at end of file +disable_tools = ["asterisc", "kontrol", "binary_signer"] diff --git a/proxyd/backend_probe.go b/proxyd/backend_probe.go index 313eaa28..f8119b92 100644 --- a/proxyd/backend_probe.go +++ b/proxyd/backend_probe.go @@ -56,7 +56,7 @@ func probeDialer() *net.Dialer { dialer := &net.Dialer{ Control: func(network, address string, c syscall.RawConn) error { return c.Control(func(fd uintptr) { - _ = syscall.SetsockoptLinger(int(fd), syscall.SOL_SOCKET, syscall.SO_LINGER, &syscall.Linger{Onoff: 1, Linger: 1}) + _ = setSockOptLinger(int(fd), syscall.SOL_SOCKET, syscall.SO_LINGER, &syscall.Linger{Onoff: 1, Linger: 1}) }) }, } diff --git a/proxyd/backend_syscall.go b/proxyd/backend_syscall.go new file mode 100644 index 00000000..492b25f7 --- /dev/null +++ b/proxyd/backend_syscall.go @@ -0,0 +1,9 @@ +//go:build !windows + +package proxyd + +import "syscall" + +func setSockOptLinger(fd int, level int, opt int, l *syscall.Linger) error { + return syscall.SetsockoptLinger(fd, level, opt, l) +} diff --git a/proxyd/backend_syscall_windows.go b/proxyd/backend_syscall_windows.go new file mode 100644 index 00000000..5450fa18 --- /dev/null +++ b/proxyd/backend_syscall_windows.go @@ -0,0 +1,9 @@ +//go:build windows + +package proxyd + +import "syscall" + +func setSockOptLinger(fd int, level int, opt int, l *syscall.Linger) error { + return syscall.SetsockoptLinger(syscall.Handle(fd), level, opt, l) +}