diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 387b3f4b..ce08e374 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -33,6 +33,23 @@ jobs: uses: actions/checkout@v5 with: lfs: 'true' + + - name: Verify server-sdk-go version + run: | + livekit_cli_ver=${GITHUB_REF#refs/tags/} + server_sdk_go_ver=$(git ls-remote --tags --sort='v:refname' https://github.com/livekit/server-sdk-go.git \ + | awk -F'refs/tags/' '{print $2}' \ + | grep -E '^v[0-9]+\.[0-9]+' \ + | tail -n1) + livekit_cli_major_minor=$(echo "$livekit_cli_ver" | sed -E 's/^v([0-9]+\.[0-9]+)\..*/\1/') + server_sdk_go_major_minor=$(echo "$server_sdk_go_ver" | sed -E 's/^v([0-9]+\.[0-9]+)\..*/\1/') + echo "livekit-cli: $livekit_cli_ver ($livekit_cli_major_minor)" + echo "server-sdk-go: $server_sdk_go_ver ($server_sdk_go_major_minor)" + if [ "$livekit_cli_major_minor" != "$server_sdk_go_major_minor" ]; then + echo "version mismatch: livekit-cli ($livekit_cli_major_minor) ≠ server-sdk-go ($server_sdk_go_major_minor)" + exit 1 + fi + echo "versions match ($livekit_cli_major_minor)" - run: git lfs pull diff --git a/cmd/lk/agent.go b/cmd/lk/agent.go index e5ed38fd..e8fbee47 100644 --- a/cmd/lk/agent.go +++ b/cmd/lk/agent.go @@ -581,7 +581,7 @@ func createAgent(ctx context.Context, cmd *cli.Command) error { regions := []string{region} excludeFiles := []string{fmt.Sprintf("**/%s", config.LiveKitTOMLFile)} - resp, err := agentsClient.CreateAgent(ctx, os.DirFS(workingDir), secrets, regions, excludeFiles) + resp, err := agentsClient.CreateAgent(ctx, os.DirFS(workingDir), secrets, regions, excludeFiles, os.Stderr) if err != nil { if twerr, ok := err.(twirp.Error); ok { return fmt.Errorf("unable to create agent: %s", twerr.Msg()) @@ -726,7 +726,7 @@ func deployAgent(ctx context.Context, cmd *cli.Command) error { } excludeFiles := []string{fmt.Sprintf("**/%s", config.LiveKitTOMLFile)} - if err := agentsClient.DeployAgent(ctx, agentId, os.DirFS(workingDir), secrets, excludeFiles); err != nil { + if err := agentsClient.DeployAgent(ctx, agentId, os.DirFS(workingDir), secrets, excludeFiles, os.Stderr); err != nil { if twerr, ok := err.(twirp.Error); ok { return fmt.Errorf("unable to deploy agent: %s", twerr.Msg()) } diff --git a/go.mod b/go.mod index cd2414ba..e15ecc0a 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/go-task/task/v3 v3.44.1 github.com/joho/godotenv v1.5.1 github.com/livekit/protocol v1.42.3-0.20251024111301-1e3becbff5d1 - github.com/livekit/server-sdk-go/v2 v2.12.1 + github.com/livekit/server-sdk-go/v2 v2.12.4 github.com/moby/patternmatcher v0.6.0 github.com/pelletier/go-toml v1.9.5 github.com/pion/rtcp v1.2.15 diff --git a/go.sum b/go.sum index 1e24255e..d3bb6956 100644 --- a/go.sum +++ b/go.sum @@ -273,6 +273,8 @@ github.com/livekit/psrpc v0.7.0 h1:rtfqfjYN06WJYloE/S0nmkJ/Y04x4pxLQLe8kQ4FVHU= github.com/livekit/psrpc v0.7.0/go.mod h1:AuDC5uOoEjQJEc69v4Li3t77Ocz0e0NdjQEuFfO+vfk= github.com/livekit/server-sdk-go/v2 v2.12.1 h1:6F4OWwWPcUjyhaWPNL5BE1XEJt9KzX4/10P5ADeL7xY= github.com/livekit/server-sdk-go/v2 v2.12.1/go.mod h1:6EZr5pBYOJ4cT1i5YnZ/L+GOeOqx6e6fKtVgU8itXuc= +github.com/livekit/server-sdk-go/v2 v2.12.4 h1:pcNCgGfO7iYb3dQij7vp2Kee8kHNRSj/lJWpA/VNtN0= +github.com/livekit/server-sdk-go/v2 v2.12.4/go.mod h1:EGWi7fcsHawWOCxUIlnSHC3fzWBsCEscLkouIZEzGKY= github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY= github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= github.com/magefile/mage v1.15.0 h1:BvGheCMAsG3bWUDbZ8AyXXpCNwU9u5CB6sM+HNb9HYg=