diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index ad1b94a6..0ad3284d 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -29,7 +29,7 @@ jobs: - uses: actions/setup-go@v2 with: - go-version: "1.18" + go-version: "1.19" - run: | go mod download diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bd340066..ea89828a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/setup-go@v2 with: - go-version: "1.18" + go-version: "1.19" - run: | sed -i '/gortsplib/d' go.mod diff --git a/Makefile b/Makefile index bf5286a9..1d9124d0 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ -BASE_IMAGE = golang:1.18-alpine3.15 +BASE_IMAGE = golang:1.19-alpine3.17 LINT_IMAGE = golangci/golangci-lint:v1.50.1 -NODE_IMAGE = node:16-alpine3.15 +NODE_IMAGE = node:16-alpine3.17 RPI32_IMAGE = balenalib/raspberry-pi:bullseye-run RPI64_IMAGE = balenalib/raspberrypi3-64:bullseye-run diff --git a/README.md b/README.md index cdf5253e..4f89ca6b 100644 --- a/README.md +++ b/README.md @@ -562,7 +562,7 @@ go tool pprof -text http://localhost:9999/debug/pprof/profile?seconds=30 #### Standard -Install Go ≥ 1.18, download the repository, open a terminal in it and run: +Install Go ≥ 1.19, download the repository, open a terminal in it and run: ```sh go build . @@ -572,7 +572,7 @@ The command will produce the `rtsp-simple-server` binary. #### Raspberry Pi -In case of a Raspberry Pi, the server can be compiled with native support for the Raspberry Pi Camera. Install Go ≥ 1.18, download the repository, open a terminal in it and run: +In case of a Raspberry Pi, the server can be compiled with native support for the Raspberry Pi Camera. Install Go ≥ 1.19, download the repository, open a terminal in it and run: ```sh cd internal/rpicamera/exe diff --git a/bench/proxy/Dockerfile b/bench/proxy/Dockerfile index 31bf9e9d..ada1391b 100644 --- a/bench/proxy/Dockerfile +++ b/bench/proxy/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.18-alpine3.14 +FROM golang:1.19-alpine3.17 RUN apk add --no-cache \ ffmpeg diff --git a/bench/publish/Dockerfile b/bench/publish/Dockerfile index 4e266f8b..b7bc6f2c 100644 --- a/bench/publish/Dockerfile +++ b/bench/publish/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.18-alpine3.14 +FROM golang:1.19-alpine3.17 RUN apk add --no-cache \ ffmpeg diff --git a/bench/read/Dockerfile b/bench/read/Dockerfile index 4fde5cfc..45b585b9 100644 --- a/bench/read/Dockerfile +++ b/bench/read/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.18-alpine3.14 +FROM golang:1.19-alpine3.17 RUN apk add --no-cache \ ffmpeg diff --git a/go.mod b/go.mod index ba524990..bb603e4d 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/aler9/rtsp-simple-server -go 1.18 +go 1.19 require ( code.cloudfoundry.org/bytefmt v0.0.0 diff --git a/internal/core/rtmp_server_test.go b/internal/core/rtmp_server_test.go index c8ed7b3a..8f8e0efb 100644 --- a/internal/core/rtmp_server_test.go +++ b/internal/core/rtmp_server_test.go @@ -126,6 +126,8 @@ func TestRTMPServerPublishRead(t *testing.T) { err = conn1.WriteTracks(videoTrack, audioTrack) require.NoError(t, err) + time.Sleep(500 * time.Millisecond) + nconn2, err := func() (net.Conn, error) { if ca == "plain" { return net.Dial("tcp", u.Host)