From 3856dafaaa058978ee95b5394c87b02d43f5fcad Mon Sep 17 00:00:00 2001 From: Benjamin Pracht Date: Tue, 9 Jan 2024 08:58:04 -0800 Subject: [PATCH 1/4] Use new upstream go-gst repository --- go.mod | 8 ++++---- go.sum | 17 +++++++++++++---- pkg/errors/errors.go | 2 +- pkg/media/input.go | 2 +- pkg/media/output.go | 10 +++++----- pkg/media/pipeline.go | 4 ++-- pkg/media/rtmp/appsrc.go | 4 ++-- pkg/media/urlpull/source.go | 2 +- pkg/media/video_output_bin.go | 2 +- pkg/media/webrtc_sink.go | 2 +- pkg/media/whip/appsrc.go | 6 +++--- pkg/media/whip/whipsrc.go | 2 +- 12 files changed, 35 insertions(+), 26 deletions(-) diff --git a/go.mod b/go.mod index 987eeb40..aa4743e7 100644 --- a/go.mod +++ b/go.mod @@ -1,12 +1,14 @@ module github.com/livekit/ingress -go 1.20 +go 1.21 -replace github.com/tinyzimmer/go-glib => github.com/livekit/go-glib v0.0.0-20230811224737-7bfaa4e57420 +toolchain go1.21.4 require ( github.com/Eyevinn/mp4ff v0.40.2 github.com/frostbyte73/core v0.0.9 + github.com/go-gst/go-glib v0.0.0-20231207075824-6d6aaf082c65 + github.com/go-gst/go-gst v0.0.0-20231207080415-7f6bb5a2d4c5 github.com/gorilla/mux v1.8.1 github.com/livekit/go-rtmp v0.0.0-20230829211117-1c4f5a5c81ed github.com/livekit/mageutil v0.0.0-20230125210925-54e8a70427c1 @@ -22,8 +24,6 @@ require ( github.com/prometheus/client_golang v1.17.0 github.com/sirupsen/logrus v1.9.3 github.com/stretchr/testify v1.8.4 - github.com/tinyzimmer/go-glib v0.0.25 - github.com/tinyzimmer/go-gst v0.2.33 github.com/urfave/cli/v2 v2.26.0 github.com/yutopp/go-flv v0.3.1 go.uber.org/atomic v1.11.0 diff --git a/go.sum b/go.sum index 87c59090..8a344891 100644 --- a/go.sum +++ b/go.sum @@ -5,7 +5,9 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r github.com/bep/debounce v1.2.1 h1:v67fRdBA9UQu2NhLFXrSg0Brw7CexQekrBwDMM8bzeY= github.com/bep/debounce v1.2.1/go.mod h1:H8yggRPQKLUhUoqrJC1bO2xNya7vanpDl7xR3ISbCJ0= github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= +github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c= github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA= +github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= @@ -27,6 +29,10 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/gammazero/deque v0.2.1 h1:qSdsbG6pgp6nL7A0+K/B7s12mcCY/5l5SIUpMOl+dC0= github.com/gammazero/deque v0.2.1/go.mod h1:LFroj8x4cMYCukHJDbxFCkT+r9AndaJnFMuZDV34tuU= +github.com/go-gst/go-glib v0.0.0-20231207075824-6d6aaf082c65 h1:G9LRxbnTdpkJAfa6vOwldiWmrtAj2L/7gZlsRZYOITA= +github.com/go-gst/go-glib v0.0.0-20231207075824-6d6aaf082c65/go.mod h1:rXuKU+tCN7pN+b/7oIyWv6MpnlGy+QWd7jRhWUNstjU= +github.com/go-gst/go-gst v0.0.0-20231207080415-7f6bb5a2d4c5 h1:2Fp5lVbX27XyGsjBcpa54YC4S36QSxLi4sQ5NdkIvUE= +github.com/go-gst/go-gst v0.0.0-20231207080415-7f6bb5a2d4c5/go.mod h1:dJg7DgrGB016HckNjcGTA82Cb4OACGw8VOsg79CxRV0= github.com/go-jose/go-jose/v3 v3.0.1 h1:pWmKFVtt+Jl0vBZTIpz/eAKwsm6LkIxDVVbFHKkchhA= github.com/go-jose/go-jose/v3 v3.0.1/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= @@ -54,6 +60,7 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -75,13 +82,13 @@ github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/q github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/lithammer/shortuuid/v4 v4.0.0 h1:QRbbVkfgNippHOS8PXDkti4NaWeyYfcBTHtw7k08o4c= github.com/lithammer/shortuuid/v4 v4.0.0/go.mod h1:Zs8puNcrvf2rV9rTH51ZLLcj7ZXqQI3lv67aw4KiB1Y= -github.com/livekit/go-glib v0.0.0-20230811224737-7bfaa4e57420 h1:b5RICTDRq0U35xgmm3VafZyh5Z7w6xFEPbT7HtgTGwQ= -github.com/livekit/go-glib v0.0.0-20230811224737-7bfaa4e57420/go.mod h1:ltV0gO6xNFzZhsIRbFXv8RTq9NGoNT2dmAER4YmZfaM= github.com/livekit/go-rtmp v0.0.0-20230829211117-1c4f5a5c81ed h1:w4c3K0j/I2qG+6PUF/ep4tf93HRibNs9QOWWD1SID50= github.com/livekit/go-rtmp v0.0.0-20230829211117-1c4f5a5c81ed/go.mod h1:X+CliWDrjhm5C+NgmxVt2ncdO3MnKDlbZHTwkuf0808= github.com/livekit/mageutil v0.0.0-20230125210925-54e8a70427c1 h1:jm09419p0lqTkDaKb5iXdynYrzB84ErPPO4LbRASk58= @@ -180,6 +187,7 @@ github.com/prometheus/procfs v0.11.1/go.mod h1:eesXgaPo1q7lBpVMoMy0ZOFTth9hBn4W/ github.com/redis/go-redis/v9 v9.3.0 h1:RiVDjmig62jIWp7Kk4XVLs0hzV6pI3PyTnnL0cnn0u0= github.com/redis/go-redis/v9 v9.3.0/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= +github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= @@ -202,8 +210,6 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/thoas/go-funk v0.9.3 h1:7+nAEx3kn5ZJcnDm2Bh23N2yOtweO14bi//dvRtgLpw= github.com/thoas/go-funk v0.9.3/go.mod h1:+IWnUfUmFO1+WVYQWQtIJHeRRdaIyyYglZN7xzUPe4Q= -github.com/tinyzimmer/go-gst v0.2.33 h1:wdwUYoN7dkWGUTrZIgB9Mp5LMRr/Sld5PVGRsE7/O9s= -github.com/tinyzimmer/go-gst v0.2.33/go.mod h1:0hI+orMYVT61TEh429LvmoV9UmyqjeTqdJ3DW2TX114= github.com/twitchtv/twirp v8.1.3+incompatible h1:+F4TdErPgSUbMZMwp13Q/KgDVuI7HJXP61mNV3/7iuU= github.com/twitchtv/twirp v8.1.3+incompatible/go.mod h1:RRJoFSAmTEh2weEqWtpPE3vFK5YBhA6bqp2l1kfCC5A= github.com/urfave/cli/v2 v2.26.0 h1:3f3AMg3HpThFNT4I++TKOejZO8yU55t3JnnSr4S4QEI= @@ -219,11 +225,13 @@ github.com/yutopp/go-flv v0.2.0/go.mod h1:xe1MPrWcfQfYeBT7E5WAF0zvKUyf1hmSpesDjB github.com/yutopp/go-flv v0.3.1 h1:4ILK6OgCJgUNm2WOjaucWM5lUHE0+sLNPdjq3L0Xtjk= github.com/yutopp/go-flv v0.3.1/go.mod h1:pAlHPSVRMv5aCUKmGOS/dZn/ooTgnc09qOPmiUNMubs= github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= +github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0= github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= +go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo= @@ -352,6 +360,7 @@ google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqw gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/pkg/errors/errors.go b/pkg/errors/errors.go index 34e6c9b3..668610f4 100644 --- a/pkg/errors/errors.go +++ b/pkg/errors/errors.go @@ -18,7 +18,7 @@ import ( "errors" "io" - "github.com/tinyzimmer/go-gst/gst" + "github.com/go-gst/go-gst/gst" "github.com/livekit/psrpc" ) diff --git a/pkg/media/input.go b/pkg/media/input.go index c8beb621..5d428fe6 100644 --- a/pkg/media/input.go +++ b/pkg/media/input.go @@ -20,7 +20,7 @@ import ( "sync" "github.com/frostbyte73/core" - "github.com/tinyzimmer/go-gst/gst" + "github.com/go-gst/go-gst/gst" "github.com/livekit/ingress/pkg/errors" "github.com/livekit/ingress/pkg/media/rtmp" diff --git a/pkg/media/output.go b/pkg/media/output.go index 8c9014c7..82eb7022 100644 --- a/pkg/media/output.go +++ b/pkg/media/output.go @@ -21,10 +21,10 @@ import ( "time" "github.com/frostbyte73/core" + "github.com/go-gst/go-gst/gst" + "github.com/go-gst/go-gst/gst/app" "github.com/pion/webrtc/v3/pkg/media" "github.com/pion/webrtc/v3/pkg/media/h264reader" - "github.com/tinyzimmer/go-gst/gst" - "github.com/tinyzimmer/go-gst/gst/app" "github.com/livekit/ingress/pkg/errors" "github.com/livekit/ingress/pkg/utils" @@ -536,14 +536,14 @@ func (e *VideoOutput) handleSample(sink *app.Sink) gst.FlowReturn { } err = e.writeSample(&media.Sample{ Data: buffer.Bytes(), - Duration: duration, + Duration: time.Duration(duration), }, ts) case livekit.VideoCodec_VP8: // untested err = e.writeSample(&media.Sample{ Data: buffer.Bytes(), - Duration: duration, + Duration: time.Duration(duration), }, ts) } @@ -579,7 +579,7 @@ func (e *AudioOutput) handleSample(sink *app.Sink) gst.FlowReturn { case livekit.AudioCodec_OPUS: err = e.writeSample(&media.Sample{ Data: buffer.Bytes(), - Duration: duration, + Duration: time.Duration(duration), }, ts) } diff --git a/pkg/media/pipeline.go b/pkg/media/pipeline.go index 00a58d8f..c76e6f0e 100644 --- a/pkg/media/pipeline.go +++ b/pkg/media/pipeline.go @@ -20,9 +20,9 @@ import ( "time" "github.com/frostbyte73/core" + "github.com/go-gst/go-glib/glib" + "github.com/go-gst/go-gst/gst" "github.com/pion/webrtc/v3" - "github.com/tinyzimmer/go-glib/glib" - "github.com/tinyzimmer/go-gst/gst" "github.com/livekit/ingress/pkg/config" "github.com/livekit/ingress/pkg/params" diff --git a/pkg/media/rtmp/appsrc.go b/pkg/media/rtmp/appsrc.go index f082cc7f..693fecaa 100644 --- a/pkg/media/rtmp/appsrc.go +++ b/pkg/media/rtmp/appsrc.go @@ -20,8 +20,8 @@ import ( "io" "net/http" - "github.com/tinyzimmer/go-gst/gst" - "github.com/tinyzimmer/go-gst/gst/app" + "github.com/go-gst/go-gst/gst" + "github.com/go-gst/go-gst/gst/app" "go.uber.org/atomic" "github.com/livekit/ingress/pkg/errors" diff --git a/pkg/media/urlpull/source.go b/pkg/media/urlpull/source.go index 9b37af1f..c4fe90da 100644 --- a/pkg/media/urlpull/source.go +++ b/pkg/media/urlpull/source.go @@ -17,7 +17,7 @@ package urlpull import ( "context" - "github.com/tinyzimmer/go-gst/gst" + "github.com/go-gst/go-gst/gst" "github.com/livekit/ingress/pkg/errors" "github.com/livekit/ingress/pkg/params" diff --git a/pkg/media/video_output_bin.go b/pkg/media/video_output_bin.go index ac780da8..04230f3d 100644 --- a/pkg/media/video_output_bin.go +++ b/pkg/media/video_output_bin.go @@ -15,7 +15,7 @@ package media import ( - "github.com/tinyzimmer/go-gst/gst" + "github.com/go-gst/go-gst/gst" "github.com/livekit/ingress/pkg/errors" "github.com/livekit/protocol/livekit" diff --git a/pkg/media/webrtc_sink.go b/pkg/media/webrtc_sink.go index 5b97ae06..b06a157f 100644 --- a/pkg/media/webrtc_sink.go +++ b/pkg/media/webrtc_sink.go @@ -17,7 +17,7 @@ package media import ( "context" - "github.com/tinyzimmer/go-gst/gst" + "github.com/go-gst/go-gst/gst" "github.com/livekit/ingress/pkg/errors" "github.com/livekit/ingress/pkg/lksdk_output" diff --git a/pkg/media/whip/appsrc.go b/pkg/media/whip/appsrc.go index 2e66acdc..0f8424c4 100644 --- a/pkg/media/whip/appsrc.go +++ b/pkg/media/whip/appsrc.go @@ -23,14 +23,14 @@ import ( "time" "github.com/frostbyte73/core" + "github.com/go-gst/go-gst/gst" + "github.com/go-gst/go-gst/gst/app" "github.com/livekit/ingress/pkg/errors" "github.com/livekit/ingress/pkg/types" "github.com/livekit/ingress/pkg/utils" "github.com/livekit/protocol/logger" "github.com/livekit/protocol/tracer" "github.com/pion/webrtc/v3" - "github.com/tinyzimmer/go-gst/gst" - "github.com/tinyzimmer/go-gst/gst/app" ) type whipAppSource struct { @@ -174,7 +174,7 @@ func (w *whipAppSource) copyRelayedData(r io.Reader) error { } b := gst.NewBufferFromBytes(re.data) - b.SetPresentationTimestamp(re.ts) + b.SetPresentationTimestamp(gst.ClockTime(re.ts)) ret := w.appSrc.PushBuffer(b) switch ret { diff --git a/pkg/media/whip/whipsrc.go b/pkg/media/whip/whipsrc.go index 4ffc08f0..a5a7d133 100644 --- a/pkg/media/whip/whipsrc.go +++ b/pkg/media/whip/whipsrc.go @@ -19,10 +19,10 @@ import ( "fmt" "io" + "github.com/go-gst/go-gst/gst" "github.com/livekit/ingress/pkg/params" "github.com/livekit/ingress/pkg/types" "github.com/livekit/protocol/utils" - "github.com/tinyzimmer/go-gst/gst" ) // TODO STUN & TURN From 36bc3d9500e9da8e130a1152ac4ced2273832168 Mon Sep 17 00:00:00 2001 From: Benjamin Pracht Date: Tue, 9 Jan 2024 09:02:25 -0800 Subject: [PATCH 2/4] Newer go toolchain --- build/test/Dockerfile | 2 +- magefile.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/test/Dockerfile b/build/test/Dockerfile index 5caa6e87..419deb3e 100644 --- a/build/test/Dockerfile +++ b/build/test/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM livekit/gstreamer:1.20.4-dev +FROM livekit/gstreamer:1.22.5-dev ARG TARGETPLATFORM diff --git a/magefile.go b/magefile.go index 5e21e041..ea069977 100644 --- a/magefile.go +++ b/magefile.go @@ -34,7 +34,7 @@ var Default = Build const ( imageName = "livekit/ingress" gstVersion = "1.22.5" - goVersion = "1.20.7" + goVersion = "1.21.5" ) var plugins = []string{"gstreamer", "gst-plugins-base", "gst-plugins-good", "gst-plugins-bad", "gst-plugins-ugly", "gst-libav"} From aeafb7638738b45565bce9e65996e3da3444c892 Mon Sep 17 00:00:00 2001 From: Benjamin Pracht Date: Tue, 9 Jan 2024 09:05:55 -0800 Subject: [PATCH 3/4] go version --- build/test/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/test/Dockerfile b/build/test/Dockerfile index 419deb3e..390b832e 100644 --- a/build/test/Dockerfile +++ b/build/test/Dockerfile @@ -24,7 +24,7 @@ RUN apt-get update && \ curl RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then GOARCH=arm64; else GOARCH=amd64; fi && \ - curl -L -o /tmp/go.tar.gz "https://go.dev/dl/go1.20.7.linux-$GOARCH.tar.gz" + curl -L -o /tmp/go.tar.gz "https://go.dev/dl/go1.21.5.linux-$GOARCH.tar.gz" RUN tar -C /usr/local -xzf /tmp/go.tar.gz ENV PATH="$PATH:/usr/local/go/bin" From 507c4ab3e5c63fb8031cf1c2e9ae42b09ea9e690 Mon Sep 17 00:00:00 2001 From: Benjamin Pracht Date: Tue, 9 Jan 2024 13:26:35 -0800 Subject: [PATCH 4/4] workflow go version --- .github/workflows/build.yaml | 2 +- .github/workflows/docker.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index a3c009ee..87537227 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -20,7 +20,7 @@ on: pull_request: branches: [ main ] env: - GOVERSION: "1.20.7" + GOVERSION: "1.21.5" GSTVERSION: "1.22.5" jobs: diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 45c48f20..f3ff782c 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -23,7 +23,7 @@ on: - 'v*.*.*' env: - GOVERSION: "1.20.7" + GOVERSION: "1.21.5" GSTVERSION: "1.22.5" jobs: @@ -55,7 +55,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: "1.20" + go-version: "1.21" - name: Download Go modules run: go mod download