Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- uses: actions/setup-go@v2
with:
stable: "false"
go-version: "1.16.2"
go-version: "1.18"
- name: set up environment variables
run: |
# must do this here because `env` doesn't allow variable expansion
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ui-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/setup-go@v2
with:
stable: "false"
go-version: "1.16.2"
go-version: "1.18"
- uses: actions/setup-node@v2
with:
node-version: "16.15.1"
Expand Down
5 changes: 2 additions & 3 deletions cmds/clients/contestcli/cli/verbs.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (
"errors"
"fmt"
"io"
"io/ioutil"
"os"
"strconv"
"strings"
Expand All @@ -38,13 +37,13 @@ func run(requestor string, transport transport.Transport, stdout io.Writer) erro
var jobDesc []byte
if flagSet.Arg(1) == "" {
fmt.Fprintf(os.Stderr, "Reading from stdin...\n")
jd, err := ioutil.ReadAll(os.Stdin)
jd, err := io.ReadAll(os.Stdin)
if err != nil {
return fmt.Errorf("failed to read job descriptor: %w", err)
}
jobDesc = jd
} else {
jd, err := ioutil.ReadFile(flagSet.Arg(1))
jd, err := os.ReadFile(flagSet.Arg(1))
if err != nil {
return fmt.Errorf("failed to read job descriptor: %w", err)
}
Expand Down
4 changes: 2 additions & 2 deletions cmds/contest-generator/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package main

import (
"fmt"
"io/ioutil"
"io"
"log"
"os"
"path"
Expand Down Expand Up @@ -147,7 +147,7 @@ func readConfig(filename string) (*Config, error) {
log.Printf("Error closing file '%s': %v", filename, err)
}
}()
data, err := ioutil.ReadAll(r)
data, err := io.ReadAll(r)
if err != nil {
return nil, fmt.Errorf("failed to read file: %w", err)
}
Expand Down
5 changes: 2 additions & 3 deletions cmds/contest-generator/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ package main

import (
"fmt"
"io/ioutil"
"log"
"os"
"path"
Expand All @@ -34,7 +33,7 @@ func main() {
flag.Usage = usage
flag.Parse()

data, err := ioutil.ReadFile(*flagTemplate)
data, err := os.ReadFile(*flagTemplate)
if err != nil {
log.Fatalf("Failed to read template file '%s': %v", *flagTemplate, err)
}
Expand All @@ -48,7 +47,7 @@ func main() {
}
outfile := *flagOutfile
if outfile == "" {
tmpdir, err := ioutil.TempDir("", "contest")
tmpdir, err := os.MkdirTemp("", "contest")
if err != nil {
log.Fatalf("Cannot create temporary directory: %v", err)
}
Expand Down
3 changes: 2 additions & 1 deletion docker/mysql/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ FROM mysql:8.0-debian
# Configure golang environment to run migration against database
ARG TARGETARCH
RUN apt-get update && apt-get install -y curl && apt-get clean
RUN curl -L https://golang.org/dl/go1.16.2.linux-$TARGETARCH.tar.gz | tar xzf -
RUN apt-get install -y git
RUN curl -L https://golang.org/dl/go1.18.linux-$TARGETARCH.tar.gz | tar xzf -
ENV GOROOT=/go
ENV PATH=$PATH:/go/bin

Expand Down
72 changes: 55 additions & 17 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,29 +1,19 @@
module github.com/linuxboot/contest

go 1.15
go 1.18

require (
github.com/OneOfOne/xxhash v1.2.8 // indirect
github.com/aws/aws-sdk-go v1.41.14
github.com/benbjohnson/clock v1.1.0
github.com/chappjc/logrus-prefix v0.0.0-20180227015900-3a1d64819adb
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/gin-gonic/gin v1.8.1
github.com/go-playground/validator/v10 v10.11.0 // indirect
github.com/go-sql-driver/mysql v1.6.0
github.com/goccy/go-json v0.9.8 // indirect
github.com/google/go-safeweb v0.0.0-20211026121254-697f59a9d57f
github.com/google/uuid v1.3.0
github.com/insomniacslk/termhook v0.0.0-20210329134026-a267c978e590
github.com/insomniacslk/xjson v0.0.0-20210106140854-1589ccfd1a1a
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
github.com/mattn/go-colorable v0.1.11 // indirect
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
github.com/onsi/ginkgo v1.12.0 // indirect
github.com/onsi/gomega v1.9.0 // indirect
github.com/pelletier/go-toml/v2 v2.0.2 // indirect
github.com/pkg/sftp v1.13.4
github.com/pkg/term v1.1.0 // indirect
github.com/pressly/goose v2.7.0+incompatible
github.com/prometheus/client_golang v1.12.2
github.com/prometheus/client_model v0.2.0
Expand All @@ -33,20 +23,68 @@ require (
github.com/stretchr/testify v1.8.0
github.com/u-root/cpu v0.0.0-20210922222005-0a371c3a086d
github.com/u-root/u-root v7.0.0+incompatible
github.com/x-cray/logrus-prefixed-formatter v0.5.2 // indirect
github.com/xaionaro-go/atomicmap v0.0.0-20210620215405-96a7f1f95a70 // indirect
github.com/xaionaro-go/metrics v0.0.0-20210425194006-68050b337673
github.com/xaionaro-go/spinlock v0.0.0-20200518175509-30e6d1ce68a1 // indirect
github.com/xaionaro-go/statuspage v0.0.0-20220629202611-97b44b308599
github.com/xaionaro-go/unsafetools v0.0.0-20210722164218-75ba48cf7b3c
go.mongodb.org/mongo-driver v1.9.1
go.uber.org/atomic v1.9.0
go.uber.org/multierr v1.7.0 // indirect
go.uber.org/zap v1.19.1
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d
golang.org/x/text v0.3.7
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
)

require (
github.com/OneOfOne/xxhash v1.2.8 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/demdxx/gocast v1.2.0 // indirect
github.com/fatih/structs v1.1.0 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/go-playground/locales v0.14.0 // indirect
github.com/go-playground/universal-translator v0.18.0 // indirect
github.com/go-playground/validator/v10 v10.11.0 // indirect
github.com/go-stack/stack v1.8.0 // indirect
github.com/goccy/go-json v0.9.8 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/snappy v0.0.1 // indirect
github.com/hugelgupf/p9 v0.1.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kevinburke/ssh_config v1.1.0 // indirect
github.com/klauspost/compress v1.13.6 // indirect
github.com/kr/fs v0.1.0 // indirect
github.com/leodido/go-urn v1.2.1 // indirect
github.com/mattn/go-colorable v0.1.11 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/onsi/ginkgo v1.12.0 // indirect
github.com/onsi/gomega v1.9.0 // indirect
github.com/pelletier/go-toml/v2 v2.0.2 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pkg/term v1.1.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/stretchr/objx v0.4.0 // indirect
github.com/ugorji/go/codec v1.2.7 // indirect
github.com/x-cray/logrus-prefixed-formatter v0.5.2 // indirect
github.com/xaionaro-go/atomicmap v0.0.0-20210620215405-96a7f1f95a70 // indirect
github.com/xaionaro-go/spinlock v0.0.0-20200518175509-30e6d1ce68a1 // indirect
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
github.com/xdg-go/scram v1.0.2 // indirect
github.com/xdg-go/stringprep v1.0.2 // indirect
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
go.uber.org/multierr v1.7.0 // indirect
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/tools v0.1.12 // indirect
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
google.golang.org/protobuf v1.28.0 // indirect
)
Loading