🏡 Housekeeping: Update to Go 1.17 (#1215)

* ⬆ Update to Go 1.17

* 🏗 Update workflows and add windows-arm64

* 💾 Update generated files

* 📛 Update not-so-friendly filenames
This commit is contained in:
database64128 2021-08-21 13:20:40 +08:00 committed by GitHub
parent 91ae805337
commit c78ee5aac7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
215 changed files with 250 additions and 90 deletions

View File

@ -22,7 +22,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v2
with:
go-version: ^1.16.4
go-version: ^1.17
- name: Checkout codebase
uses: actions/checkout@v2

View File

@ -57,6 +57,8 @@ jobs:
goarch: arm64
- goos: linux
goarch: riscv64
- goos: windows
goarch: arm64
# BEGIN MIPS
- goos: linux
goarch: mips64
@ -98,7 +100,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: ^1.16.4
go-version: ^1.17
- name: Get project dependencies
run: go mod download
@ -169,7 +171,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: ^1.16.4
go-version: ^1.17
- uses: actions/download-artifact@v2
with:

View File

@ -30,7 +30,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v2
with:
go-version: ^1.16.4
go-version: ^1.17
- name: Checkout codebase
uses: actions/checkout@v2

View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.27.1
// protoc v3.15.6
// protoc v3.17.3
// source: app/browserforwarder/config.proto
package browserforwarder

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package browserforwarder

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package commander

View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.27.1
// protoc v3.15.6
// protoc v3.17.3
// source: app/commander/config.proto
package commander

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package commander

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package commander

View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.27.1
// protoc v3.15.6
// protoc v3.17.3
// source: app/dispatcher/config.proto
package dispatcher

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package dispatcher

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package dispatcher

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package dispatcher

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package dispatcher

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package dispatcher

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package dns

View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.27.1
// protoc v3.15.6
// protoc v3.17.3
// source: app/dns/config.proto
package dns

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
// Package dns is an implementation of core.DNS feature.

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package dns

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package dns

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package fakedns

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package fakedns

View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.27.1
// protoc v3.15.6
// protoc v3.17.3
// source: app/dns/fakedns/fakedns.proto
package fakedns

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package dns

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package dns

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package dns

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package dns

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package dns

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package dns

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package dns

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package dns

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package command

View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.27.1
// protoc v3.15.6
// protoc v3.17.3
// source: app/log/command/config.proto
package command

View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.27.1
// protoc v3.15.6
// protoc v3.17.3
// source: app/log/config.proto
package log

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package log

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package log

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package command

View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.27.1
// protoc v3.15.6
// protoc v3.17.3
// source: app/observatory/command/command.proto
package command

View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.27.1
// protoc v3.15.6
// protoc v3.17.3
// source: app/observatory/config.proto
package observatory

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package observatory

View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.27.1
// protoc v3.15.6
// protoc v3.17.3
// source: app/policy/config.proto
package policy

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package command

View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.27.1
// protoc v3.15.6
// protoc v3.17.3
// source: app/proxyman/command/command.proto
package command

View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.27.1
// protoc v3.15.6
// protoc v3.17.3
// source: app/proxyman/config.proto
package proxyman

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package reverse

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package reverse

View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.27.1
// protoc v3.15.6
// protoc v3.17.3
// source: app/reverse/config.proto
package reverse

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package reverse

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package reverse

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package router

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package command

View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.27.1
// protoc v3.15.6
// protoc v3.17.3
// source: app/router/command/command.proto
package command

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package router

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package router

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package router

View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.27.1
// protoc v3.15.6
// protoc v3.17.3
// source: app/router/config.proto
package router

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package router

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package router

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package stats

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package command

View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.27.1
// protoc v3.15.6
// protoc v3.17.3
// source: app/stats/command/command.proto
package command

View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.27.1
// protoc v3.15.6
// protoc v3.17.3
// source: app/stats/config.proto
package stats

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package stats

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package stats

View File

@ -1,6 +1,5 @@
// +build !windows
// +build !wasm
// +build !illumos
//go:build !windows && !wasm && !illumos
// +build !windows,!wasm,!illumos
package buf

View File

@ -1,3 +1,4 @@
//go:build !wasm
// +build !wasm
package buf

View File

@ -1,3 +1,4 @@
//go:build wasm
// +build wasm
package buf

View File

@ -1,3 +1,4 @@
//go:build !wasm
// +build !wasm
package buf_test

View File

@ -1,3 +1,4 @@
//go:build illumos
// +build illumos
package buf

View File

@ -1,3 +1,4 @@
//go:build generate
// +build generate
package main

View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.27.1
// protoc v3.15.6
// protoc v3.17.3
// source: common/log/log.proto
package log

View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.27.1
// protoc v3.15.6
// protoc v3.17.3
// source: common/net/address.proto
package net

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package net

View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.27.1
// protoc v3.15.6
// protoc v3.17.3
// source: common/net/destination.proto
package net

View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.27.1
// protoc v3.15.6
// protoc v3.17.3
// source: common/net/network.proto
package net

View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.27.1
// protoc v3.15.6
// protoc v3.17.3
// source: common/net/port.proto
package net

View File

@ -1,3 +1,4 @@
//go:build !windows
// +build !windows
package ctlcmd

View File

@ -1,3 +1,4 @@
//go:build windows
// +build windows
package ctlcmd

View File

@ -1,3 +1,4 @@
//go:build !windows
// +build !windows
package platform

View File

@ -1,3 +1,4 @@
//go:build windows
// +build windows
package platform

View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.27.1
// protoc v3.15.6
// protoc v3.17.3
// source: common/protocol/headers.proto
package protocol

View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.27.1
// protoc v3.15.6
// protoc v3.17.3
// source: common/protocol/server_spec.proto
package protocol

View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.27.1
// protoc v3.15.6
// protoc v3.17.3
// source: common/protocol/user.proto
package protocol

View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.27.1
// protoc v3.15.6
// protoc v3.17.3
// source: common/serial/typed_message.proto
package serial

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package core

View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.27.1
// protoc v3.15.6
// protoc v3.17.3
// source: config.proto
package core

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package core

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package core

26
go.mod
View File

@ -1,6 +1,6 @@
module github.com/v2fly/v2ray-core/v4
go 1.16
go 1.17
require (
github.com/golang/mock v1.6.0
@ -25,3 +25,27 @@ require (
google.golang.org/protobuf v1.27.1
h12.io/socks v1.0.3
)
require (
github.com/cheekybits/genny v1.0.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dgryski/go-metro v0.0.0-20200812162917-85c65e2d0165 // indirect
github.com/ebfe/bcrypt_pbkdf v0.0.0-20140212075826-3c8d2dcb253a // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 // indirect
github.com/marten-seemann/qtls-go1-16 v0.1.4 // indirect
github.com/marten-seemann/qtls-go1-17 v0.1.0 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/onsi/ginkgo v1.16.4 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 // indirect
github.com/xtaci/smux v1.5.15 // indirect
golang.org/x/mod v0.4.2 // indirect
golang.org/x/text v0.3.6 // indirect
golang.org/x/tools v0.1.1 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c // indirect
)

1
go.sum
View File

@ -462,7 +462,6 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069 h1:siQdpVirKtzPhKl3lZWozZraCFObP8S1v6PRp0bLrtU=
golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=

View File

@ -1,3 +1,4 @@
//go:build coveragemain
// +build coveragemain
package main

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
// Package blackhole is an outbound handler that blocks all connections.

View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.27.1
// protoc v3.15.6
// protoc v3.17.3
// source: proxy/blackhole/config.proto
package blackhole

View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.27.1
// protoc v3.15.6
// protoc v3.17.3
// source: proxy/dns/config.proto
package dns

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package dns

View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.27.1
// protoc v3.15.6
// protoc v3.17.3
// source: proxy/dokodemo/config.proto
package dokodemo

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package dokodemo

View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.27.1
// protoc v3.15.6
// protoc v3.17.3
// source: proxy/freedom/config.proto
package freedom

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package freedom

View File

@ -1,3 +1,4 @@
//go:build !confonly
// +build !confonly
package http

Some files were not shown because too many files have changed in this diff Show More