Merge branch '0.1.1' into develop
This commit is contained in:
commit
b82282bbf3
2
.github/workflows/browser-testing.yml
vendored
2
.github/workflows/browser-testing.yml
vendored
@ -40,7 +40,7 @@ jobs:
|
||||
|
||||
- uses: actions/setup-go@v4
|
||||
with:
|
||||
go-version: '1.18.8'
|
||||
go-version: '1.20'
|
||||
cache: true
|
||||
|
||||
- name: Install Google Chrome
|
||||
|
2
.github/workflows/go-lint.yml
vendored
2
.github/workflows/go-lint.yml
vendored
@ -28,7 +28,7 @@ jobs:
|
||||
|
||||
- uses: actions/setup-go@v4
|
||||
with:
|
||||
go-version: '1.18.8'
|
||||
go-version: '1.20'
|
||||
cache: true
|
||||
- uses: actions/checkout@v3
|
||||
- name: golangci-lint
|
||||
|
2
.github/workflows/go-tests.yaml
vendored
2
.github/workflows/go-tests.yaml
vendored
@ -12,7 +12,7 @@ jobs:
|
||||
test:
|
||||
strategy:
|
||||
matrix:
|
||||
go-version: [1.18.x, 1.19.x]
|
||||
go-version: [1.19.x, 1.20.x]
|
||||
os: [ubuntu-latest, macos-latest, windows-latest]
|
||||
runs-on: ${{ matrix.os }}
|
||||
steps:
|
||||
|
2
.github/workflows/hls-tests.yml
vendored
2
.github/workflows/hls-tests.yml
vendored
@ -27,7 +27,7 @@ jobs:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/setup-go@v4
|
||||
with:
|
||||
go-version: '1.18.8'
|
||||
go-version: '1.20'
|
||||
cache: true
|
||||
|
||||
- name: Cache node modules
|
||||
|
2
.github/workflows/screenshots.yml
vendored
2
.github/workflows/screenshots.yml
vendored
@ -17,7 +17,7 @@ jobs:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/setup-go@v4
|
||||
with:
|
||||
go-version: '1.18.8'
|
||||
go-version: '1.20'
|
||||
cache: true
|
||||
|
||||
- name: Cache node modules
|
||||
|
@ -5,7 +5,7 @@ run:
|
||||
# Define the Go version limit.
|
||||
# Mainly related to generics support in go1.18.
|
||||
# Default: use Go version from the go.mod file, fallback on the env var `GOVERSION`, fallback on 1.18
|
||||
go: '1.18'
|
||||
go: '1.20'
|
||||
|
||||
issues:
|
||||
# The linter has a default list of ignorable errors. Turning this on will enable that list.
|
||||
@ -69,7 +69,7 @@ linters-settings:
|
||||
|
||||
gosimple:
|
||||
# Select the Go version to target. The default is '1.13'.
|
||||
go: '1.18'
|
||||
go: '1.20'
|
||||
# https://staticcheck.io/docs/options#checks
|
||||
checks: ['all']
|
||||
|
||||
|
@ -3,7 +3,7 @@ package resolvers
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"io/ioutil"
|
||||
"io"
|
||||
"net/http"
|
||||
|
||||
"github.com/go-fed/activity/streams"
|
||||
@ -63,7 +63,7 @@ func ResolveIRI(c context.Context, iri string, callbacks ...interface{}) error {
|
||||
|
||||
defer response.Body.Close()
|
||||
|
||||
data, err := ioutil.ReadAll(response.Body)
|
||||
data, err := io.ReadAll(response.Body)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
@ -3,7 +3,6 @@ package admin
|
||||
import (
|
||||
"fmt"
|
||||
"io"
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
"os"
|
||||
"os/exec"
|
||||
@ -147,7 +146,7 @@ func getContainerID() string {
|
||||
pid := os.Getppid()
|
||||
cgroupPath := fmt.Sprintf("/proc/%s/cgroup", strconv.Itoa(pid))
|
||||
containerID := ""
|
||||
content, err := ioutil.ReadFile(cgroupPath) //nolint:gosec
|
||||
content, err := os.ReadFile(cgroupPath) //nolint:gosec
|
||||
if err != nil {
|
||||
return containerID
|
||||
}
|
||||
|
@ -21,6 +21,9 @@ type FileWriterReceiverServiceCallback interface {
|
||||
}
|
||||
|
||||
// FileWriterReceiverService accepts transcoder responses via HTTP and fires the callbacks.
|
||||
// It is intended to be the middleman between the transcoder and the storage provider and allows
|
||||
// the transcoder process to be completely isolated and even run remotely in the future, as long
|
||||
// as it can send HTTP requests to this service with the results.
|
||||
type FileWriterReceiverService struct {
|
||||
callbacks FileWriterReceiverServiceCallback
|
||||
}
|
||||
|
2
go.mod
2
go.mod
@ -1,6 +1,6 @@
|
||||
module github.com/owncast/owncast
|
||||
|
||||
go 1.18
|
||||
go 1.20
|
||||
|
||||
require (
|
||||
github.com/aws/aws-sdk-go v1.44.271
|
||||
|
@ -14,7 +14,6 @@ import (
|
||||
"path/filepath"
|
||||
"regexp"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
log "github.com/sirupsen/logrus"
|
||||
"github.com/yuin/goldmark"
|
||||
@ -358,7 +357,6 @@ func GetHashtagsFromText(text string) []string {
|
||||
|
||||
// ShuffleStringSlice will shuffle a slice of strings.
|
||||
func ShuffleStringSlice(s []string) []string {
|
||||
rand.Seed(time.Now().UnixNano())
|
||||
rand.Shuffle(len(s), func(i, j int) {
|
||||
s[i], s[j] = s[j], s[i]
|
||||
})
|
||||
|
Loading…
x
Reference in New Issue
Block a user