diff --git a/go.mod b/go.mod index fb04f9b5e..69ede427e 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/pires/go-proxyproto v0.3.1 github.com/seiflotfy/cuckoofilter v0.0.0-20201009151232-afb285a456ab github.com/stretchr/testify v1.6.1 - github.com/xiaokangwang/VSign v0.0.0-20200828155424-dc1c86b73fbf + github.com/v2fly/VSign v0.0.0-20201107160721-6e7f92656885 github.com/xtls/go v0.0.0-20201101145325-207fdcada8d0 go.starlark.net v0.0.0-20201014215153-dff0ae5b4820 golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 diff --git a/go.sum b/go.sum index 19e290403..1ad05ce72 100644 --- a/go.sum +++ b/go.sum @@ -169,10 +169,10 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= +github.com/v2fly/VSign v0.0.0-20201107160721-6e7f92656885 h1:nbFN1ZhtcffOD3ZWx0LVG7IkHX6/g+slFLShZRNUWJ0= +github.com/v2fly/VSign v0.0.0-20201107160721-6e7f92656885/go.mod h1:p80Bv154ZtrGpXMN15slDCqc9UGmfBuUzheDFBYaW/M= github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU= github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM= -github.com/xiaokangwang/VSign v0.0.0-20200828155424-dc1c86b73fbf h1:d4keT3SwLbrgnEe2zbtijPLgKE15n0ZbvJZzRH/a9GM= -github.com/xiaokangwang/VSign v0.0.0-20200828155424-dc1c86b73fbf/go.mod h1:jTwBnzBuqZP3VX/Z65ErYb9zd4anQprSC7N38TmAp1E= github.com/xtls/go v0.0.0-20201101145325-207fdcada8d0 h1:Q0OSaIJ+wOy38+g5KYVP9slhbznXwsYGkzscpUrVsak= github.com/xtls/go v0.0.0-20201101145325-207fdcada8d0/go.mod h1:5TB2+k58gx4A4g2Nf5miSHNDF6CuAzHKpWBooLAshTs= go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA= diff --git a/infra/control/verify.go b/infra/control/verify.go index 5c7064b52..84a1ae14f 100644 --- a/infra/control/verify.go +++ b/infra/control/verify.go @@ -4,7 +4,7 @@ import ( "flag" "os" - "github.com/xiaokangwang/VSign/signerVerify" + "github.com/v2fly/VSign/signerVerify" "v2ray.com/core/common" ) diff --git a/release/bleedingrelease.sh b/release/bleedingrelease.sh index 1b3c0312d..1cdd1b78d 100755 --- a/release/bleedingrelease.sh +++ b/release/bleedingrelease.sh @@ -32,40 +32,40 @@ ART_ROOT=${WORKDIR}/bazel-bin/release pushd ${ART_ROOT} { - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen version ${RELEASE_TAG} - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen project "v2flyunstable" - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-macos-64.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-windows-64.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-windows-32.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-windows-arm32-v7a.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-linux-64.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-linux-32.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-linux-arm64-v8a.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-linux-arm32-v7a.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-linux-arm32-v6.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-linux-arm32-v5.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-linux-mips64.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-linux-mips64le.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-linux-mips32.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-linux-mips32le.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-linux-ppc64.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-linux-ppc64le.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-linux-riscv64.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-linux-s390x.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-freebsd-64.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-freebsd-32.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-openbsd-64.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-openbsd-32.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-dragonfly-64.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen version ${RELEASE_TAG} + go run github.com/v2fly/V2BuildAssist/v2buildutil gen project "v2flyunstable" + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-macos-64.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-windows-64.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-windows-32.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-windows-arm32-v7a.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-linux-64.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-linux-32.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-linux-arm64-v8a.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-linux-arm32-v7a.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-linux-arm32-v6.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-linux-arm32-v5.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-linux-mips64.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-linux-mips64le.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-linux-mips32.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-linux-mips32le.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-linux-ppc64.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-linux-ppc64le.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-linux-riscv64.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-linux-s390x.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-freebsd-64.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-freebsd-32.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-openbsd-64.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-openbsd-32.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-dragonfly-64.zip } >Release.unsigned.unsorted - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen sort < Release.unsigned.unsorted > Release.unsigned + go run github.com/v2fly/V2BuildAssist/v2buildutil gen sort < Release.unsigned.unsorted > Release.unsigned { echo "Build Finished" echo "https://github.com/v2fly/V2FlyBleedingEdgeBinary/releases/tag/${RELEASE_TAG}" } > buildcomment - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil post commit "${RELEASE_SHA}" < buildcomment + go run github.com/v2fly/V2BuildAssist/v2buildutil post commit "${RELEASE_SHA}" < buildcomment popd upload ${ART_ROOT}/v2ray-macos-64.zip diff --git a/release/tagrelease.sh b/release/tagrelease.sh index dde6b9793..20a2f3d8f 100755 --- a/release/tagrelease.sh +++ b/release/tagrelease.sh @@ -52,33 +52,33 @@ ART_ROOT=${WORKDIR}/bazel-bin/release pushd ${ART_ROOT} { - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen version "${GITHUB_RELEASE_TAG}" - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen project "v2fly" - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-macos-64.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-windows-64.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-windows-32.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-windows-arm32-v7a.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-linux-64.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-linux-32.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-linux-arm64-v8a.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-linux-arm32-v7a.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-linux-arm32-v6.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-linux-arm32-v5.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-linux-mips64.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-linux-mips64le.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-linux-mips32.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-linux-mips32le.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-linux-ppc64.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-linux-ppc64le.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-linux-riscv64.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-linux-s390x.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-freebsd-64.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-freebsd-32.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-openbsd-64.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-openbsd-32.zip - go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen file v2ray-dragonfly-64.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen version "${GITHUB_RELEASE_TAG}" + go run github.com/v2fly/V2BuildAssist/v2buildutil gen project "v2fly" + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-macos-64.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-windows-64.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-windows-32.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-windows-arm32-v7a.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-linux-64.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-linux-32.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-linux-arm64-v8a.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-linux-arm32-v7a.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-linux-arm32-v6.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-linux-arm32-v5.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-linux-mips64.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-linux-mips64le.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-linux-mips32.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-linux-mips32le.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-linux-ppc64.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-linux-ppc64le.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-linux-riscv64.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-linux-s390x.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-freebsd-64.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-freebsd-32.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-openbsd-64.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-openbsd-32.zip + go run github.com/v2fly/V2BuildAssist/v2buildutil gen file v2ray-dragonfly-64.zip } >Release.unsigned.unsorted -go run github.com/xiaokangwang/V2BuildAssist/v2buildutil gen sort Release.unsigned +go run github.com/v2fly/V2BuildAssist/v2buildutil gen sort Release.unsigned popd