diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b41e4336..7915026d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: steps: - uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 - uses: actions/checkout@v3 - name: golangci-lint uses: golangci/golangci-lint-action@v3 @@ -51,7 +51,7 @@ jobs: strategy: fail-fast: false matrix: - goversion: ["1.17", "1.18"] + goversion: ["1.17", "1.18", "1.19"] name: Build & Test (Linux, Go ${{ matrix.goversion }}) needs: [lint] @@ -75,7 +75,7 @@ jobs: strategy: fail-fast: false matrix: - goversion: ["1.17", "1.18"] + goversion: ["1.17", "1.18", "1.19"] name: Build & Test (Windows, Go ${{ matrix.goversion }}) needs: [lint] @@ -99,7 +99,7 @@ jobs: strategy: fail-fast: false matrix: - goversion: ["1.17", "1.18"] + goversion: ["1.17", "1.18", "1.19"] name: Build & Test (macOS, Go ${{ matrix.goversion }}) needs: [lint] @@ -148,7 +148,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 - name: Build package env: @@ -180,7 +180,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 - name: Build package env: @@ -212,7 +212,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 - name: Build package run: sh contrib/msi/build-msi.sh ${{ matrix.pkgarch }} @@ -248,7 +248,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 - name: Build package env: diff --git a/cmd/yggdrasil/main.go b/cmd/yggdrasil/main.go index 7f751833..5d1c76ac 100644 --- a/cmd/yggdrasil/main.go +++ b/cmd/yggdrasil/main.go @@ -8,7 +8,7 @@ import ( "encoding/json" "flag" "fmt" - "io/ioutil" + "io" "net" "os" "os/signal" @@ -51,10 +51,10 @@ func readConfig(log *log.Logger, useconf bool, useconffile string, normaliseconf var err error if useconffile != "" { // Read the file from the filesystem - conf, err = ioutil.ReadFile(useconffile) + conf, err = os.ReadFile(useconffile) } else { // Read the file from stdin. - conf, err = ioutil.ReadAll(os.Stdin) + conf, err = io.ReadAll(os.Stdin) } if err != nil { panic(err) diff --git a/cmd/yggdrasilctl/cmd_line_env.go b/cmd/yggdrasilctl/cmd_line_env.go index bd6df8fc..c1acacd6 100644 --- a/cmd/yggdrasilctl/cmd_line_env.go +++ b/cmd/yggdrasilctl/cmd_line_env.go @@ -4,7 +4,6 @@ import ( "bytes" "flag" "fmt" - "io/ioutil" "log" "os" @@ -61,7 +60,7 @@ func (cmdLineEnv *CmdLineEnv) parseFlagsAndArgs() { func (cmdLineEnv *CmdLineEnv) setEndpoint(logger *log.Logger) { if cmdLineEnv.server == cmdLineEnv.endpoint { - if config, err := ioutil.ReadFile(defaults.GetDefaults().DefaultConfigFile); err == nil { + if config, err := os.ReadFile(defaults.GetDefaults().DefaultConfigFile); err == nil { if bytes.Equal(config[0:2], []byte{0xFF, 0xFE}) || bytes.Equal(config[0:2], []byte{0xFE, 0xFF}) { utf := unicode.UTF16(unicode.BigEndian, unicode.UseBOM) diff --git a/src/core/core.go b/src/core/core.go index f41b6531..37a1d841 100644 --- a/src/core/core.go +++ b/src/core/core.go @@ -4,7 +4,7 @@ import ( "context" "crypto/ed25519" "fmt" - "io/ioutil" + "io" "net" "net/url" "os" @@ -67,7 +67,7 @@ func New(secret ed25519.PrivateKey, opts ...SetupOption) (*Core, error) { c._applyOption(opt) } if c.log == nil { - c.log = log.New(ioutil.Discard, "", 0) + c.log = log.New(io.Discard, "", 0) } c.proto.init(c) if err := c.links.init(c); err != nil {