Small build fixes
Some checks failed
rolling-release / build (push) Has been cancelled
rolling-release / rolling-release (push) Has been cancelled

This commit is contained in:
Dmitrii Okunev
2025-03-17 01:18:22 +00:00
parent 993c11dac3
commit 57cf079e81
8 changed files with 23 additions and 7 deletions

View File

@@ -26,7 +26,7 @@ jobs:
- name: setup go - name: setup go
uses: actions/setup-go@v5 uses: actions/setup-go@v5
with: with:
go-version: '1.23' go-version: '1.24'
check-latest: true check-latest: true
- name: add ffmpeg7 repo - name: add ffmpeg7 repo
run: sudo add-apt-repository -y ppa:ubuntuhandbook1/ffmpeg7 run: sudo add-apt-repository -y ppa:ubuntuhandbook1/ffmpeg7

View File

@@ -4,7 +4,7 @@ RUN sudo apt update && sudo apt dist-upgrade -fy && sudo apt clean
USER builder USER builder
WORKDIR /home/builder WORKDIR /home/builder
RUN git clone -b feat/static_libav https://github.com/xaionaro/termux-packages RUN git clone https://github.com/xaionaro/termux-packages
WORKDIR /home/builder/termux-packages WORKDIR /home/builder/termux-packages
RUN ./scripts/setup-android-sdk.sh RUN ./scripts/setup-android-sdk.sh

6
go.mod
View File

@@ -19,12 +19,12 @@ replace github.com/rs/zerolog v1.33.0 => github.com/xaionaro-go/zerolog2belt v0.
replace github.com/bluenviron/gortsplib/v4 v4.11.0 => github.com/xaionaro-go/gortsplib/v4 v4.0.0-20241123213409-7279dabb7de6 replace github.com/bluenviron/gortsplib/v4 v4.11.0 => github.com/xaionaro-go/gortsplib/v4 v4.0.0-20241123213409-7279dabb7de6
replace github.com/asticode/go-astiav v0.33.1 => github.com/xaionaro-go/astiav v0.0.0-20250106205037-a1605f324663
replace github.com/wlynxg/anet => github.com/BieHDC/anet v0.0.6-0.20241226223613-d47f8b766b3c replace github.com/wlynxg/anet => github.com/BieHDC/anet v0.0.6-0.20241226223613-d47f8b766b3c
replace github.com/nicklaw5/helix/v2 v2.30.1-0.20240715193454-0151ccccf980 => github.com/xaionaro-go/helix/v2 v2.0.0-20250309182928-f54c9d4c8a29 replace github.com/nicklaw5/helix/v2 v2.30.1-0.20240715193454-0151ccccf980 => github.com/xaionaro-go/helix/v2 v2.0.0-20250309182928-f54c9d4c8a29
replace github.com/asticode/go-astiav v0.35.0 => github.com/xaionaro-go/astiav v0.0.0-20250317012930-39df462db826
require ( require (
github.com/facebookincubator/go-belt v0.0.0-20250308011339-62fb7027b11f github.com/facebookincubator/go-belt v0.0.0-20250308011339-62fb7027b11f
github.com/go-git/go-billy/v5 v5.5.0 github.com/go-git/go-billy/v5 v5.5.0
@@ -232,7 +232,7 @@ require (
github.com/andreykaipov/goobs v1.4.1 github.com/andreykaipov/goobs v1.4.1
github.com/anthonynsimon/bild v0.14.0 github.com/anthonynsimon/bild v0.14.0
github.com/asaskevich/EventBus v0.0.0-20200907212545-49d423059eef github.com/asaskevich/EventBus v0.0.0-20200907212545-49d423059eef
github.com/asticode/go-astiav v0.33.1 github.com/asticode/go-astiav v0.35.0
github.com/bamiaux/rez v0.0.0-20170731184118-29f4463c688b github.com/bamiaux/rez v0.0.0-20170731184118-29f4463c688b
github.com/bluenviron/gortsplib/v4 v4.11.0 github.com/bluenviron/gortsplib/v4 v4.11.0
github.com/chai2010/webp v1.1.1 github.com/chai2010/webp v1.1.1

4
go.sum
View File

@@ -1026,8 +1026,8 @@ github.com/volatiletech/sqlboiler/v4 v4.16.2/go.mod h1:B14BPBGTrJ2X6l7lwnvV/iXgY
github.com/volatiletech/strmangle v0.0.1/go.mod h1:F6RA6IkB5vq0yTG4GQ0UsbbRcl3ni9P76i+JrTBKFFg= github.com/volatiletech/strmangle v0.0.1/go.mod h1:F6RA6IkB5vq0yTG4GQ0UsbbRcl3ni9P76i+JrTBKFFg=
github.com/volatiletech/strmangle v0.0.6 h1:AdOYE3B2ygRDq4rXDij/MMwq6KVK/pWAYxpC7CLrkKQ= github.com/volatiletech/strmangle v0.0.6 h1:AdOYE3B2ygRDq4rXDij/MMwq6KVK/pWAYxpC7CLrkKQ=
github.com/volatiletech/strmangle v0.0.6/go.mod h1:ycDvbDkjDvhC0NUU8w3fWwl5JEMTV56vTKXzR3GeR+0= github.com/volatiletech/strmangle v0.0.6/go.mod h1:ycDvbDkjDvhC0NUU8w3fWwl5JEMTV56vTKXzR3GeR+0=
github.com/xaionaro-go/astiav v0.0.0-20250106205037-a1605f324663 h1:b0lOm2erjkc/D1/BBa1m9F/jV5AEhU6sRzkcqwTUZH8= github.com/xaionaro-go/astiav v0.0.0-20250317012930-39df462db826 h1:oVwbZ1xRjLNXkq5VvRULgca280hRAPuaJOvmVo/rFNU=
github.com/xaionaro-go/astiav v0.0.0-20250106205037-a1605f324663/go.mod h1:K7D8UC6GeQt85FUxk2KVwYxHnotrxuEnp5evkkudc2s= github.com/xaionaro-go/astiav v0.0.0-20250317012930-39df462db826/go.mod h1:K7D8UC6GeQt85FUxk2KVwYxHnotrxuEnp5evkkudc2s=
github.com/xaionaro-go/audio v0.0.0-20250210102901-abfced9d5ef3 h1:LRIpqqC7Gsz5+/EsIWRtdPZZPMpx9yykUVFyUnRaKbE= github.com/xaionaro-go/audio v0.0.0-20250210102901-abfced9d5ef3 h1:LRIpqqC7Gsz5+/EsIWRtdPZZPMpx9yykUVFyUnRaKbE=
github.com/xaionaro-go/audio v0.0.0-20250210102901-abfced9d5ef3/go.mod h1:i4CntPlryh9HLmA3p3M0CNr1usRkEkuh3N2Ui3HeXQA= github.com/xaionaro-go/audio v0.0.0-20250210102901-abfced9d5ef3/go.mod h1:i4CntPlryh9HLmA3p3M0CNr1usRkEkuh3N2Ui3HeXQA=
github.com/xaionaro-go/avpipeline v0.0.0-20250217031756-936d572a90d3 h1:LTRvnANTG31qkDdlQUe5tjqMDgC6hxlPoOgv5dCJTlU= github.com/xaionaro-go/avpipeline v0.0.0-20250217031756-936d572a90d3 h1:LTRvnANTG31qkDdlQUe5tjqMDgC6hxlPoOgv5dCJTlU=

View File

@@ -3,3 +3,9 @@ package autoupdater
type ProgressBar interface { type ProgressBar interface {
SetProgress(progress float64) SetProgress(progress float64)
} }
type DummyProgressBar struct{}
var _ ProgressBar = (*DummyProgressBar)(nil)
func (DummyProgressBar) SetProgress(float64) {}

View File

@@ -19,6 +19,9 @@ func (u *Update) Apply(
ctx context.Context, ctx context.Context,
progressBar ProgressBar, progressBar ProgressBar,
) error { ) error {
if progressBar == nil {
progressBar = DummyProgressBar{}
}
progressBar.SetProgress(0) progressBar.SetProgress(0)
logger.Debugf(ctx, "applying the update %#+v", u.Release) logger.Debugf(ctx, "applying the update %#+v", u.Release)

View File

@@ -3,6 +3,7 @@ package twitch
import ( import (
"context" "context"
"fmt" "fmt"
"sync"
"github.com/adeithe/go-twitch/irc" "github.com/adeithe/go-twitch/irc"
"github.com/xaionaro-go/observability" "github.com/xaionaro-go/observability"
@@ -18,6 +19,7 @@ type ChatClient interface {
type ChatHandler struct { type ChatHandler struct {
client ChatClient client ChatClient
cancelFunc context.CancelFunc cancelFunc context.CancelFunc
waitGroup sync.WaitGroup
messagesInChan chan irc.ChatMessage messagesInChan chan irc.ChatMessage
messagesOutChan chan streamcontrol.ChatMessage messagesOutChan chan streamcontrol.ChatMessage
} }
@@ -47,7 +49,9 @@ func newChatHandler(
messagesOutChan: make(chan streamcontrol.ChatMessage, 100), messagesOutChan: make(chan streamcontrol.ChatMessage, 100),
} }
h.waitGroup.Add(1)
observability.Go(ctx, func() { observability.Go(ctx, func() {
defer h.waitGroup.Done()
defer func() { defer func() {
h.client.Close() h.client.Close()
// h.Client.Close above waits inside for everything to finish, // h.Client.Close above waits inside for everything to finish,
@@ -84,6 +88,7 @@ func (h *ChatHandler) onShardMessage(shard int, msg irc.ChatMessage) {
func (h *ChatHandler) Close() error { func (h *ChatHandler) Close() error {
h.cancelFunc() h.cancelFunc()
h.waitGroup.Wait()
return nil return nil
} }

View File

@@ -54,6 +54,7 @@ func TestChatHandler(t *testing.T) {
expectedEvent := streamcontrol.ChatMessage{ expectedEvent := streamcontrol.ChatMessage{
UserID: "user-id", UserID: "user-id",
Username: "user-id",
MessageID: "message-id", MessageID: "message-id",
Message: "some\nmulti line\n message", Message: "some\nmulti line\n message",
} }
@@ -64,6 +65,7 @@ func TestChatHandler(t *testing.T) {
go func() { go func() {
defer wg.Done() defer wg.Done()
for ev := range h.messagesOutChan { for ev := range h.messagesOutChan {
ev.CreatedAt = time.Time{}
require.Equal(t, expectedEvent, ev) require.Equal(t, expectedEvent, ev)
messagesCount++ messagesCount++
} }