diff --git a/.github/workflows/buildtest.yaml b/.github/workflows/buildtest.yaml index be0e93d8f..75f1585a2 100644 --- a/.github/workflows/buildtest.yaml +++ b/.github/workflows/buildtest.yaml @@ -38,7 +38,7 @@ jobs: - name: Set up Go uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6 with: - go-version: "^1.26" + go-version: "^1.25" - name: Set up gotestfmt run: go install github.com/gotesttools/gotestfmt/v2/cmd/gotestfmt@v2.4.1 diff --git a/Dockerfile b/Dockerfile index 4fb0a92f6..d2ad082df 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.26-alpine AS builder +FROM golang:1.25-alpine AS builder ARG TARGETPLATFORM ARG TARGETARCH diff --git a/go.mod b/go.mod index ab51cf738..4e957eac9 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/livekit/livekit-server -go 1.26 +go 1.25.0 require ( github.com/bep/debounce v1.2.1 @@ -21,7 +21,7 @@ require ( github.com/jxskiss/base62 v1.1.0 github.com/livekit/mageutil v0.0.0-20250511045019-0f1ff63f7731 github.com/livekit/mediatransportutil v0.0.0-20260501135216-8818f1b77e59 - github.com/livekit/protocol v1.45.8-0.20260506075942-ff4d6b682dc7 + github.com/livekit/protocol v1.45.8-0.20260505211410-5dd801462b33 github.com/livekit/psrpc v0.7.1 github.com/mackerelio/go-osstat v0.2.7 github.com/magefile/mage v1.17.0 diff --git a/go.sum b/go.sum index 5841fc89a..4558a9f0d 100644 --- a/go.sum +++ b/go.sum @@ -181,8 +181,8 @@ github.com/livekit/mageutil v0.0.0-20250511045019-0f1ff63f7731 h1:9x+U2HGLrSw5AT github.com/livekit/mageutil v0.0.0-20250511045019-0f1ff63f7731/go.mod h1:Rs3MhFwutWhGwmY1VQsygw28z5bWcnEYmS1OG9OxjOQ= github.com/livekit/mediatransportutil v0.0.0-20260501135216-8818f1b77e59 h1:lWRMrb4ReRJu/e/BAp1kpT6fQOjS8WjCxdp0PGjgrBc= github.com/livekit/mediatransportutil v0.0.0-20260501135216-8818f1b77e59/go.mod h1:RCd46PT+6sEztld6XpkCrG1xskb0u3SqxIjy4G897Ss= -github.com/livekit/protocol v1.45.8-0.20260506075942-ff4d6b682dc7 h1:MR+ZMMPFas+H0WXg4N1WdSZwhDByqz16/Ayh+Tuc9XE= -github.com/livekit/protocol v1.45.8-0.20260506075942-ff4d6b682dc7/go.mod h1:KEPIJ/ZdMFQ9tmmfv/uT9TjQEuEcZupCZBabuRGEC1k= +github.com/livekit/protocol v1.45.8-0.20260505211410-5dd801462b33 h1:mr5ALVvQhQ7sdvaRAM5vNWPtBjmLSM1C2vLHOgzqwBs= +github.com/livekit/protocol v1.45.8-0.20260505211410-5dd801462b33/go.mod h1:Q4uw9Bkz7ucNxPP/lcVj6IkVMYzlq3TwYo2TRFL6BN0= github.com/livekit/psrpc v0.7.1 h1:ms37az0QTD3UXIWuUC5D/SkmKOlRMVRsI261eBWu/Vw= github.com/livekit/psrpc v0.7.1/go.mod h1:bZ4iHFQptTkbPnB0LasvRNu/OBYXEu1NA6O5BMFo9kk= github.com/mackerelio/go-osstat v0.2.7 h1:TCavZi10wF49bT6iQZ9eT2keGZQpC69MTDfdJej5e94= diff --git a/pkg/service/ioservice_sip.go b/pkg/service/ioservice_sip.go index 349be9c85..0140466f2 100644 --- a/pkg/service/ioservice_sip.go +++ b/pkg/service/ioservice_sip.go @@ -123,7 +123,6 @@ func (s *IOInfoService) EvaluateSIPDispatchRules(ctx context.Context, req *rpc.E if err != nil { return nil, err } - resp.Upgrade() resp.SipTrunkId = trunkID return resp, err } diff --git a/pkg/service/sip.go b/pkg/service/sip.go index d98d92d33..f714e5698 100644 --- a/pkg/service/sip.go +++ b/pkg/service/sip.go @@ -421,7 +421,6 @@ func (s *SIPService) CreateSIPDispatchRule(ctx context.Context, req *livekit.Cre if s.store == nil { return nil, ErrSIPNotConnected } - req.DispatchRule.Upgrade() if err := req.Validate(); err != nil { return nil, twirp.WrapError(twirp.NewError(twirp.InvalidArgument, err.Error()), err) } @@ -630,7 +629,6 @@ func (s *SIPService) CreateSIPParticipantRequest(ctx context.Context, req *livek if s.store == nil { return nil, ErrSIPNotConnected } - req.Upgrade() if err := req.Validate(); err != nil { return nil, twirp.WrapError(twirp.NewError(twirp.InvalidArgument, err.Error()), err) }