Merge branch '0.1.1' into develop

This commit is contained in:
Gabe Kangas 2023-05-30 10:12:09 -07:00
commit b82282bbf3
No known key found for this signature in database
GPG Key ID: 4345B2060657F330
11 changed files with 14 additions and 14 deletions

View File

@ -40,7 +40,7 @@ jobs:
- uses: actions/setup-go@v4 - uses: actions/setup-go@v4
with: with:
go-version: '1.18.8' go-version: '1.20'
cache: true cache: true
- name: Install Google Chrome - name: Install Google Chrome

View File

@ -28,7 +28,7 @@ jobs:
- uses: actions/setup-go@v4 - uses: actions/setup-go@v4
with: with:
go-version: '1.18.8' go-version: '1.20'
cache: true cache: true
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: golangci-lint - name: golangci-lint

View File

@ -12,7 +12,7 @@ jobs:
test: test:
strategy: strategy:
matrix: matrix:
go-version: [1.18.x, 1.19.x] go-version: [1.19.x, 1.20.x]
os: [ubuntu-latest, macos-latest, windows-latest] os: [ubuntu-latest, macos-latest, windows-latest]
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps:

View File

@ -27,7 +27,7 @@ jobs:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions/setup-go@v4 - uses: actions/setup-go@v4
with: with:
go-version: '1.18.8' go-version: '1.20'
cache: true cache: true
- name: Cache node modules - name: Cache node modules

View File

@ -17,7 +17,7 @@ jobs:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions/setup-go@v4 - uses: actions/setup-go@v4
with: with:
go-version: '1.18.8' go-version: '1.20'
cache: true cache: true
- name: Cache node modules - name: Cache node modules

View File

@ -5,7 +5,7 @@ run:
# Define the Go version limit. # Define the Go version limit.
# Mainly related to generics support in go1.18. # 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 # 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: issues:
# The linter has a default list of ignorable errors. Turning this on will enable that list. # The linter has a default list of ignorable errors. Turning this on will enable that list.
@ -69,7 +69,7 @@ linters-settings:
gosimple: gosimple:
# Select the Go version to target. The default is '1.13'. # Select the Go version to target. The default is '1.13'.
go: '1.18' go: '1.20'
# https://staticcheck.io/docs/options#checks # https://staticcheck.io/docs/options#checks
checks: ['all'] checks: ['all']

View File

@ -3,7 +3,7 @@ package resolvers
import ( import (
"context" "context"
"encoding/json" "encoding/json"
"io/ioutil" "io"
"net/http" "net/http"
"github.com/go-fed/activity/streams" "github.com/go-fed/activity/streams"
@ -63,7 +63,7 @@ func ResolveIRI(c context.Context, iri string, callbacks ...interface{}) error {
defer response.Body.Close() defer response.Body.Close()
data, err := ioutil.ReadAll(response.Body) data, err := io.ReadAll(response.Body)
if err != nil { if err != nil {
return err return err
} }

View File

@ -3,7 +3,6 @@ package admin
import ( import (
"fmt" "fmt"
"io" "io"
"io/ioutil"
"net/http" "net/http"
"os" "os"
"os/exec" "os/exec"
@ -147,7 +146,7 @@ func getContainerID() string {
pid := os.Getppid() pid := os.Getppid()
cgroupPath := fmt.Sprintf("/proc/%s/cgroup", strconv.Itoa(pid)) cgroupPath := fmt.Sprintf("/proc/%s/cgroup", strconv.Itoa(pid))
containerID := "" containerID := ""
content, err := ioutil.ReadFile(cgroupPath) //nolint:gosec content, err := os.ReadFile(cgroupPath) //nolint:gosec
if err != nil { if err != nil {
return containerID return containerID
} }

View File

@ -21,6 +21,9 @@ type FileWriterReceiverServiceCallback interface {
} }
// FileWriterReceiverService accepts transcoder responses via HTTP and fires the callbacks. // 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 { type FileWriterReceiverService struct {
callbacks FileWriterReceiverServiceCallback callbacks FileWriterReceiverServiceCallback
} }

2
go.mod
View File

@ -1,6 +1,6 @@
module github.com/owncast/owncast module github.com/owncast/owncast
go 1.18 go 1.20
require ( require (
github.com/aws/aws-sdk-go v1.44.271 github.com/aws/aws-sdk-go v1.44.271

View File

@ -14,7 +14,6 @@ import (
"path/filepath" "path/filepath"
"regexp" "regexp"
"strings" "strings"
"time"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/yuin/goldmark" "github.com/yuin/goldmark"
@ -358,7 +357,6 @@ func GetHashtagsFromText(text string) []string {
// ShuffleStringSlice will shuffle a slice of strings. // ShuffleStringSlice will shuffle a slice of strings.
func ShuffleStringSlice(s []string) []string { func ShuffleStringSlice(s []string) []string {
rand.Seed(time.Now().UnixNano())
rand.Shuffle(len(s), func(i, j int) { rand.Shuffle(len(s), func(i, j int) {
s[i], s[j] = s[j], s[i] s[i], s[j] = s[j], s[i]
}) })