Skip to content

Commit

Permalink
go.mod: Bump go and livepeer-data version (#2804)
Browse files Browse the repository at this point in the history
* go.mod: Update livepeer-data lib

* server: Fix MetadataQueue type

Type changed on livepeer-data version

* go.mod: Bump go to 1.20

The upgrade indirectly added a module that requires 1.19

* changelog: Change changelog

* Go 1.20 -> 1.20.4

* Get rid of go-version-file

* Bump lint version

* Set go version in another place

* go fmt

* Add glog goroutine to ignored leak ones

* Change order of go mod command

* Bump linter version

---------

Co-authored-by: Thom Shutt <[email protected]>
  • Loading branch information
victorges and thomshutt authored Jun 6, 2023
1 parent 7888548 commit 1b9da7f
Show file tree
Hide file tree
Showing 11 changed files with 191 additions and 604 deletions.
9 changes: 3 additions & 6 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ jobs:
id: go
uses: actions/setup-go@v4
with:
go-version: 1.17
go-version-file: go.mod
go-version: 1.20.4
cache: true
cache-dependency-path: go.sum

Expand Down Expand Up @@ -153,8 +152,7 @@ jobs:
id: go
uses: actions/setup-go@v4
with:
go-version: 1.17
go-version-file: go.mod
go-version: 1.20.4
cache: true
cache-dependency-path: go.sum

Expand Down Expand Up @@ -259,8 +257,7 @@ jobs:
id: go
uses: actions/setup-go@v4
with:
go-version: 1.17
go-version-file: go.mod
go-version: 1.20.4
cache: true
cache-dependency-path: go.sum

Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ jobs:
id: go
uses: actions/setup-go@v4
with:
go-version: 1.17
go-version-file: go.mod
go-version: 1.20.4
cache: true
cache-dependency-path: go.sum

Expand Down Expand Up @@ -90,7 +89,7 @@ jobs:
- name: Lint
uses: golangci/golangci-lint-action@v3
with:
version: v1.39.0
version: v1.52.2
args: '--disable-all --enable=gofmt --enable=vet --enable=golint --deadline=4m pm verification'

- name: Run Revive Action by building from repository
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG_PENDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
- \#2759 Parse keystore address without 0x prefix, fix parse error logging
- \#2764 Call session end asynchronously to avoid unnecessary blocking (@mjh1)
- \#2777 Only write session end log message if session exists (@mjh1)
- \#2804 Bump livepeer-data and go version due to breaking interface change (@victorges)

#### CLI

Expand Down
4 changes: 3 additions & 1 deletion common/testutil.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,9 @@ func IgnoreRoutines() []goleak.Option {
"internal/poll.runtime_pollWait", "github.com/livepeer/go-livepeer/core.(*RemoteTranscoderManager).Manage", "github.com/livepeer/lpms/core.(*LPMS).Start",
"github.com/livepeer/go-livepeer/server.(*LivepeerServer).StartMediaServer", "github.com/livepeer/go-livepeer/core.(*RemoteTranscoderManager).Manage.func1",
"github.com/livepeer/go-livepeer/server.(*LivepeerServer).HandlePush.func1", "github.com/rjeczalik/notify.(*nonrecursiveTree).dispatch",
"github.com/rjeczalik/notify.(*nonrecursiveTree).internal", "github.com/livepeer/lpms/stream.NewBasicRTMPVideoStream.func1", "github.com/patrickmn/go-cache.(*janitor).Run"}
"github.com/rjeczalik/notify.(*nonrecursiveTree).internal", "github.com/livepeer/lpms/stream.NewBasicRTMPVideoStream.func1", "github.com/patrickmn/go-cache.(*janitor).Run",
"github.com/golang/glog.(*fileSink).flushDaemon",
}

res := make([]goleak.Option, 0, len(funcs2ignore))
for _, f := range funcs2ignore {
Expand Down
2 changes: 1 addition & 1 deletion core/playlistmanager.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const (

var JsonPlaylistQuitTimeout = 60 * time.Second

// PlaylistManager manages playlists and data for one video stream, backed by one object storage.
// PlaylistManager manages playlists and data for one video stream, backed by one object storage.
type PlaylistManager interface {
ManifestID() ManifestID
// Implicitly creates master and media playlists
Expand Down
11 changes: 5 additions & 6 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ENV GOARCH="$TARGETARCH" \

RUN apt update \
&& apt install -yqq software-properties-common curl apt-transport-https lsb-release \
&& curl -fsSL https://dl.google.com/go/go1.17.6.linux-${BUILDARCH}.tar.gz | tar -C /usr/local -xz \
&& curl -fsSL https://dl.google.com/go/go1.20.4.linux-${BUILDARCH}.tar.gz | tar -C /usr/local -xz \
&& curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \
&& add-apt-repository "deb [arch=${BUILDARCH}] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \
&& curl -fsSl https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
Expand Down Expand Up @@ -48,14 +48,13 @@ COPY ./install_ffmpeg.sh ./install_ffmpeg.sh
ARG BUILD_TAGS
ENV BUILD_TAGS=${BUILD_TAGS}

RUN ./install_ffmpeg.sh \
&& GO111MODULE=on go get -v github.com/golangci/golangci-lint/cmd/[email protected] \
&& go get -v github.com/jstemmer/go-junit-report

COPY go.mod go.sum ./

RUN go mod download

RUN ./install_ffmpeg.sh \
&& GO111MODULE=on go get -v github.com/golangci/golangci-lint/cmd/[email protected] \
&& go get -v github.com/jstemmer/go-junit-report

COPY . .

RUN make livepeer livepeer_cli livepeer_bench livepeer_router
Expand Down
4 changes: 2 additions & 2 deletions eth/watchers/timewatcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (

// TimeWatcher allows for subscriptions to certain data feeds using a caller provided sink channel
// consumers of the TimeWatcher can subscribe to following data feeds:
// * Last Initialized Round Number
// * Last Seen Block Number
// - Last Initialized Round Number
// - Last Seen Block Number
type TimeWatcher struct {
// state
mu sync.RWMutex
Expand Down
116 changes: 101 additions & 15 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,40 +1,126 @@
module github.com/livepeer/go-livepeer

go 1.13
go 1.20

require (
contrib.go.opencensus.io/exporter/prometheus v0.4.2
github.com/allegro/bigcache v1.2.1 // indirect
github.com/cenkalti/backoff v2.2.1+incompatible
github.com/cespare/cp v1.1.1 // indirect
github.com/ethereum/go-ethereum v1.10.26
github.com/fatih/color v1.12.0 // indirect
github.com/golang/glog v0.0.0-20210429001901-424d2337a529
github.com/golang/glog v1.1.1
github.com/golang/mock v1.6.0
github.com/golang/protobuf v1.5.2
github.com/golang/protobuf v1.5.3
github.com/jaypipes/ghw v0.10.0
github.com/jaypipes/pcidb v1.0.0
github.com/livepeer/go-tools v0.0.0-20220805063103-76df6beb6506
github.com/livepeer/livepeer-data v0.4.11
github.com/livepeer/livepeer-data v0.7.2-0.20230601112542-e54477bc9479
github.com/livepeer/lpms v0.0.0-20230125115958-32cd1538cc04
github.com/livepeer/m3u8 v0.11.1
github.com/mattn/go-sqlite3 v1.14.16
github.com/olekukonko/tablewriter v0.0.5
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/peterbourgon/ff/v3 v3.3.0
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.13.0
github.com/prometheus/tsdb v0.10.0 // indirect
github.com/rjeczalik/notify v0.9.2 // indirect
github.com/status-im/keycard-go v0.0.0-20190424133014-d95853db0f48 // indirect
github.com/prometheus/client_golang v1.14.0
github.com/stretchr/testify v1.8.1
github.com/testcontainers/testcontainers-go v0.12.0
github.com/tyler-smith/go-bip39 v1.0.2 // indirect
github.com/urfave/cli v1.22.12
go.opencensus.io v0.24.0
go.uber.org/goleak v1.2.2-0.20230213210001-751da596f6f7
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 // indirect
golang.org/x/net v0.0.0-20220722155237-a158d28d115b
google.golang.org/grpc v1.51.0
golang.org/x/net v0.8.0
google.golang.org/grpc v1.54.0
pgregory.net/rapid v0.4.0
)

require (
cloud.google.com/go v0.110.0 // indirect
cloud.google.com/go/compute v1.19.0 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/iam v0.13.0 // indirect
cloud.google.com/go/storage v1.28.1 // indirect
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
github.com/Microsoft/go-winio v0.4.17-0.20210211115548-6eac466e5fa3 // indirect
github.com/Microsoft/hcsshim v0.8.16 // indirect
github.com/StackExchange/wmi v1.2.1 // indirect
github.com/aws/aws-sdk-go v1.44.64 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/btcsuite/btcd/btcec/v2 v2.2.0 // indirect
github.com/cespare/cp v1.1.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68 // indirect
github.com/containerd/containerd v1.5.0-beta.4 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/deckarep/golang-set v1.8.0 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91 // indirect
github.com/docker/distribution v2.7.1+incompatible // indirect
github.com/docker/docker v20.10.11+incompatible // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.4.0 // indirect
github.com/dop251/goja v0.0.0-20220405120441-9037c2b61cbf // indirect
github.com/fatih/color v1.12.0 // indirect
github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.5.1 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
github.com/go-stack/stack v1.8.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
github.com/googleapis/gax-go/v2 v2.7.1 // indirect
github.com/gorilla/websocket v1.4.2 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/karalabe/usb v0.0.2 // indirect
github.com/klauspost/compress v1.16.3 // indirect
github.com/livepeer/joy4 v0.1.2-0.20191121080656-b2fea45cbded // indirect
github.com/magiconair/properties v1.8.5 // indirect
github.com/mattn/go-colorable v0.1.8 // indirect
github.com/mattn/go-isatty v0.0.12 // indirect
github.com/mattn/go-runewidth v0.0.9 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/moby/sys/mount v0.2.0 // indirect
github.com/moby/sys/mountinfo v0.5.0 // indirect
github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirect
github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.1 // indirect
github.com/opencontainers/runc v1.0.2 // indirect
github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7 // indirect
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/prometheus/statsd_exporter v0.22.7 // indirect
github.com/prometheus/tsdb v0.10.0 // indirect
github.com/rabbitmq/amqp091-go v1.8.0 // indirect
github.com/rabbitmq/rabbitmq-stream-go-client v1.1.1 // indirect
github.com/rjeczalik/notify v0.9.2 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/status-im/keycard-go v0.0.0-20190424133014-d95853db0f48 // indirect
github.com/stretchr/objx v0.5.0 // indirect
github.com/tklauser/go-sysconf v0.3.5 // indirect
github.com/tklauser/numcpus v0.2.2 // indirect
github.com/tyler-smith/go-bip39 v1.0.2 // indirect
golang.org/x/crypto v0.1.0 // indirect
golang.org/x/oauth2 v0.6.0 // indirect
golang.org/x/sys v0.6.0 // indirect
golang.org/x/text v0.8.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/api v0.114.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230330154414-c0448cd141ea // indirect
google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
howett.net/plist v1.0.0 // indirect
)
Loading

0 comments on commit 1b9da7f

Please sign in to comment.