mirror of
https://github.com/v2fly/v2ray-core.git
synced 2024-12-22 01:57:12 -05:00
clean code (#22)
This commit is contained in:
Kslr
GitHub
parent
0dfeba6a2f
commit
2c8f06e121
10
.vscode/settings.json
vendored
10
.vscode/settings.json
vendored
@ -1,10 +0,0 @@
|
||||
// Place your settings in this file to overwrite default and user settings.
|
||||
{
|
||||
"editor.tabSize": 2,
|
||||
"protoc": {
|
||||
"options": [
|
||||
"--proto_path=${env.GOPATH}/src/",
|
||||
"--proto_path=${env.GOPATH}/src/github.com/google/protobuf/src"
|
||||
]
|
||||
}
|
||||
}
|
||||
51
.vscode/tasks.json
vendored
51
.vscode/tasks.json
vendored
@ -1,51 +0,0 @@
|
||||
{
|
||||
"version": "2.0.0",
|
||||
"command": "go",
|
||||
"type": "shell",
|
||||
"presentation": {
|
||||
"echo": true,
|
||||
"reveal": "always",
|
||||
"focus": false,
|
||||
"panel": "shared"
|
||||
},
|
||||
"tasks": [
|
||||
{
|
||||
"label": "build",
|
||||
"args": ["v2ray.com/core/..."],
|
||||
"group": "build",
|
||||
"problemMatcher": {
|
||||
"owner": "go",
|
||||
"fileLocation": ["relative", "${workspaceRoot}"],
|
||||
"pattern": {
|
||||
"regexp": "^([^:]+\\.go):(\\d+):(.*)",
|
||||
"file": 1,
|
||||
"line": 2,
|
||||
"message": 3
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"label": "test",
|
||||
"args": ["-p", "1", "v2ray.com/core/..."],
|
||||
"group": "test"
|
||||
},
|
||||
{
|
||||
"label": "Escape Analysis",
|
||||
"type": "shell",
|
||||
"command": "go build -gcflags -m .",
|
||||
"problemMatcher": {
|
||||
"pattern": {
|
||||
"regexp": "^(.*):(.*):(.*): (.*)$",
|
||||
"file": 1,
|
||||
"line": 2,
|
||||
"column": 3,
|
||||
"message": 4
|
||||
},
|
||||
"fileLocation": ["relative", "${fileDirname}"]
|
||||
},
|
||||
"options": {
|
||||
"cwd": "${fileDirname}"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
@ -1,26 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
GO_AMD64=https://storage.googleapis.com/golang/go1.11.1.linux-amd64.tar.gz
|
||||
GO_X86=https://storage.googleapis.com/golang/go1.11.1.linux-386.tar.gz
|
||||
ARCH=$(uname -m)
|
||||
GO_CUR=${GO_AMD64}
|
||||
|
||||
if [ "$ARCH" == "i686" ] || [ "$ARCH" == "i386" ]; then
|
||||
GO_CUR=${GO_X86}
|
||||
fi
|
||||
|
||||
which git > /dev/null || apt-get install git -y
|
||||
|
||||
if [ -z "$GOPATH" ]; then
|
||||
curl -o go_latest.tar.gz ${GO_CUR}
|
||||
tar -C /usr/local -xzf go_latest.tar.gz
|
||||
rm go_latest.tar.gz
|
||||
export PATH=$PATH:/usr/local/go/bin
|
||||
|
||||
mkdir /v2ray &> /dev/null
|
||||
export GOPATH=/v2ray
|
||||
fi
|
||||
|
||||
go get -insecure -u v2ray.com/core/...
|
||||
go build -o $GOPATH/bin/v2ray v2ray.com/core/main
|
||||
go build -o $GOPATH/bin/v2ctl v2ray.com/core/infra/control/main
|
||||
@ -1,208 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -x
|
||||
|
||||
apt-get update
|
||||
apt-get -y install \
|
||||
jq `# for parsing Github API` \
|
||||
git `# for go get` \
|
||||
file `# for Github upload` \
|
||||
pkg-config zip g++ zlib1g-dev unzip python `# for Bazel` \
|
||||
openssl `# for binary digest` \
|
||||
|
||||
|
||||
function getattr() {
|
||||
curl -s -H "Metadata-Flavor: Google" http://metadata.google.internal/computeMetadata/v1/$2/attributes/$1
|
||||
}
|
||||
|
||||
GITHUB_TOKEN=$(getattr "github_token" "project")
|
||||
RELEASE_TAG=$(getattr "release_tag" "instance")
|
||||
PRERELEASE=$(getattr "prerelease" "instance")
|
||||
DOCKER_HUB_KEY=$(getattr "docker_hub_key" "project")
|
||||
SIGN_KEY_PATH=$(getattr "sign_key_path" "project")
|
||||
SIGN_KEY_PASS=$(getattr "sign_key_pass" "project")
|
||||
VUSER=$(getattr "b_user" "project")
|
||||
|
||||
mkdir -p /v2/build
|
||||
|
||||
pushd /v2/build
|
||||
BAZEL_VER=0.23.0
|
||||
curl -L -O https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VER}/bazel-${BAZEL_VER}-installer-linux-x86_64.sh
|
||||
chmod +x bazel-${BAZEL_VER}-installer-linux-x86_64.sh
|
||||
./bazel-${BAZEL_VER}-installer-linux-x86_64.sh
|
||||
popd
|
||||
|
||||
gsutil cp ${SIGN_KEY_PATH} /v2/build/sign_key.asc
|
||||
echo ${SIGN_KEY_PASS} | gpg --passphrase-fd 0 --batch --import /v2/build/sign_key.asc
|
||||
|
||||
curl -L -o /v2/build/releases https://api.github.com/repos/v2ray/v2ray-core/releases
|
||||
|
||||
GO_INSTALL=golang.tar.gz
|
||||
curl -L -o ${GO_INSTALL} https://storage.googleapis.com/golang/go1.11.5.linux-amd64.tar.gz
|
||||
tar -C /usr/local -xzf ${GO_INSTALL}
|
||||
export PATH=$PATH:/usr/local/go/bin
|
||||
|
||||
mkdir -p /v2/src
|
||||
export GOPATH=/v2
|
||||
|
||||
# Download all source code
|
||||
go get -insecure -t v2ray.com/core/...
|
||||
go get -insecure -t v2ray.com/ext/...
|
||||
|
||||
pushd $GOPATH/src/v2ray.com/core/
|
||||
git checkout tags/${RELEASE_TAG}
|
||||
|
||||
VERN=${RELEASE_TAG:1}
|
||||
BUILDN=`date +%Y%m%d`
|
||||
sed -i "s/\(version *= *\"\).*\(\"\)/\1$VERN\2/g" core.go
|
||||
sed -i "s/\(build *= *\"\).*\(\"\)/\1$BUILDN\2/g" core.go
|
||||
popd
|
||||
|
||||
pushd $GOPATH/src/v2ray.com/core/
|
||||
# Update geoip.dat
|
||||
curl -L -o release/config/geoip.dat "https://github.com/v2ray/geoip/raw/release/geoip.dat"
|
||||
sleep 1
|
||||
|
||||
# Update geosite.dat
|
||||
curl -L -o release/config/geosite.dat "https://github.com/v2ray/domain-list-community/raw/release/dlc.dat"
|
||||
sleep 1
|
||||
popd
|
||||
|
||||
# Take a snapshot of all required source code
|
||||
pushd $GOPATH/src
|
||||
|
||||
# Create zip file for all sources
|
||||
zip -9 -r /v2/build/src_all.zip * -x '*.git*'
|
||||
popd
|
||||
|
||||
pushd $GOPATH/src/v2ray.com/core/
|
||||
bazel build --action_env=GOPATH=$GOPATH --action_env=PATH=$PATH --action_env=GPG_PASS=${SIGN_KEY_PASS} //release:all
|
||||
popd
|
||||
|
||||
RELBODY="https://www.v2ray.com/chapter_00/01_versions.html"
|
||||
JSON_DATA=$(echo "{}" | jq -c ".tag_name=\"${RELEASE_TAG}\"")
|
||||
JSON_DATA=$(echo ${JSON_DATA} | jq -c ".prerelease=${PRERELEASE}")
|
||||
JSON_DATA=$(echo ${JSON_DATA} | jq -c ".body=\"${RELBODY}\"")
|
||||
RELEASE_ID=$(curl --data "${JSON_DATA}" -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/v2ray/v2ray-core/releases | jq ".id")
|
||||
|
||||
function uploadfile() {
|
||||
FILE=$1
|
||||
CTYPE=$(file -b --mime-type $FILE)
|
||||
|
||||
sleep 1
|
||||
curl -H "Authorization: token ${GITHUB_TOKEN}" -H "Content-Type: ${CTYPE}" --data-binary @$FILE "https://uploads.github.com/repos/v2ray/v2ray-core/releases/${RELEASE_ID}/assets?name=$(basename $FILE)"
|
||||
sleep 1
|
||||
}
|
||||
|
||||
function upload() {
|
||||
FILE=$1
|
||||
DGST=$1.dgst
|
||||
openssl dgst -md5 $FILE | sed 's/([^)]*)//g' >> $DGST
|
||||
openssl dgst -sha1 $FILE | sed 's/([^)]*)//g' >> $DGST
|
||||
openssl dgst -sha256 $FILE | sed 's/([^)]*)//g' >> $DGST
|
||||
openssl dgst -sha512 $FILE | sed 's/([^)]*)//g' >> $DGST
|
||||
uploadfile $FILE
|
||||
uploadfile $DGST
|
||||
}
|
||||
|
||||
ART_ROOT=$GOPATH/src/v2ray.com/core/bazel-bin/release
|
||||
|
||||
upload ${ART_ROOT}/v2ray-macos.zip
|
||||
upload ${ART_ROOT}/v2ray-windows-64.zip
|
||||
upload ${ART_ROOT}/v2ray-windows-32.zip
|
||||
upload ${ART_ROOT}/v2ray-linux-64.zip
|
||||
upload ${ART_ROOT}/v2ray-linux-32.zip
|
||||
upload ${ART_ROOT}/v2ray-linux-arm.zip
|
||||
upload ${ART_ROOT}/v2ray-linux-arm64.zip
|
||||
upload ${ART_ROOT}/v2ray-linux-mips64.zip
|
||||
upload ${ART_ROOT}/v2ray-linux-mips64le.zip
|
||||
upload ${ART_ROOT}/v2ray-linux-mips.zip
|
||||
upload ${ART_ROOT}/v2ray-linux-mipsle.zip
|
||||
upload ${ART_ROOT}/v2ray-linux-ppc64.zip
|
||||
upload ${ART_ROOT}/v2ray-linux-ppc64le.zip
|
||||
upload ${ART_ROOT}/v2ray-linux-s390x.zip
|
||||
upload ${ART_ROOT}/v2ray-freebsd-64.zip
|
||||
upload ${ART_ROOT}/v2ray-freebsd-32.zip
|
||||
upload ${ART_ROOT}/v2ray-openbsd-64.zip
|
||||
upload ${ART_ROOT}/v2ray-openbsd-32.zip
|
||||
upload ${ART_ROOT}/v2ray-dragonfly-64.zip
|
||||
upload /v2/build/src_all.zip
|
||||
|
||||
if [[ "${PRERELEASE}" == "false" ]]; then
|
||||
|
||||
DOCKER_HUB_API=https://cloud.docker.com/api/build/v1/source/62bfa37d-18ef-4b66-8f1a-35f9f3d4438b/trigger/65027872-e73e-4177-8c6c-6448d2f00d5b/call/
|
||||
curl -H "Content-Type: application/json" --data '{"build": true}' -X POST "${DOCKER_HUB_API}"
|
||||
|
||||
# Update homebrew
|
||||
pushd ${ART_ROOT}
|
||||
V_HASH256=$(sha256sum v2ray-macos.zip | cut -d ' ' -f 1)
|
||||
popd
|
||||
|
||||
echo "SHA256: ${V_HASH256}"
|
||||
echo "Version: ${VERN}"
|
||||
|
||||
DOWNLOAD_URL="https://github.com/v2ray/v2ray-core/releases/download/v${VERN}/v2ray-macos.zip"
|
||||
|
||||
cd $GOPATH/src/v2ray.com/
|
||||
git clone https://github.com/v2ray/homebrew-v2ray.git
|
||||
|
||||
echo "Updating config"
|
||||
|
||||
cd homebrew-v2ray
|
||||
|
||||
sed -i "s#^\s*url.*# url \"$DOWNLOAD_URL\"#g" Formula/v2ray-core.rb
|
||||
sed -i "s#^\s*sha256.*# sha256 \"$V_HASH256\"#g" Formula/v2ray-core.rb
|
||||
sed -i "s#^\s*version.*# version \"$VERN\"#g" Formula/v2ray-core.rb
|
||||
|
||||
echo "Updating repo"
|
||||
|
||||
git config user.name "Darien Raymond"
|
||||
git config user.email "admin@v2ray.com"
|
||||
|
||||
git commit -am "update to version $VERN"
|
||||
git push --quiet "https://${GITHUB_TOKEN}@github.com/v2ray/homebrew-v2ray" master:master
|
||||
|
||||
echo "Updating dist"
|
||||
|
||||
cd $GOPATH/src/v2ray.com/
|
||||
mkdir dist
|
||||
cd dist
|
||||
|
||||
git init
|
||||
git config user.name "Darien Raymond"
|
||||
git config user.email "admin@v2ray.com"
|
||||
|
||||
cp ${ART_ROOT}/v2ray-macos.zip .
|
||||
cp ${ART_ROOT}/v2ray-windows-64.zip .
|
||||
cp ${ART_ROOT}/v2ray-windows-32.zip .
|
||||
cp ${ART_ROOT}/v2ray-linux-64.zip .
|
||||
cp ${ART_ROOT}/v2ray-linux-32.zip .
|
||||
cp ${ART_ROOT}/v2ray-linux-arm.zip .
|
||||
cp ${ART_ROOT}/v2ray-linux-arm64.zip .
|
||||
cp ${ART_ROOT}/v2ray-linux-mips64.zip .
|
||||
cp ${ART_ROOT}/v2ray-linux-mips64le.zip .
|
||||
cp ${ART_ROOT}/v2ray-linux-mips.zip .
|
||||
cp ${ART_ROOT}/v2ray-linux-mipsle.zip .
|
||||
cp ${ART_ROOT}/v2ray-linux-ppc64.zip .
|
||||
cp ${ART_ROOT}/v2ray-linux-ppc64le.zip .
|
||||
cp ${ART_ROOT}/v2ray-linux-s390x.zip .
|
||||
cp ${ART_ROOT}/v2ray-freebsd-64.zip .
|
||||
cp ${ART_ROOT}/v2ray-freebsd-32.zip .
|
||||
cp ${ART_ROOT}/v2ray-openbsd-64.zip .
|
||||
cp ${ART_ROOT}/v2ray-openbsd-32.zip .
|
||||
cp ${ART_ROOT}/v2ray-dragonfly-64.zip .
|
||||
cp /v2/build/src_all.zip .
|
||||
cp "$GOPATH/src/v2ray.com/core/release/install-release.sh" ./install.sh
|
||||
|
||||
sed -i "s/^NEW_VER=\"\"$/NEW_VER=\"${RELEASE_TAG}\"/" install.sh
|
||||
sed -i 's/^DIST_SRC=".*"$/DIST_SRC="jsdelivr"/' install.sh
|
||||
|
||||
git add .
|
||||
git commit -m "Version ${RELEASE_TAG}"
|
||||
git tag -a "${RELEASE_TAG}" -m "Version ${RELEASE_TAG}"
|
||||
git remote add origin "https://${GITHUB_TOKEN}@github.com/v2ray/dist"
|
||||
git push -u --force --follow-tags origin master
|
||||
|
||||
fi
|
||||
|
||||
shutdown -h now
|
||||
@ -1,7 +1,7 @@
|
||||
#!/bin/bash
|
||||
|
||||
pushd "$GOPATH/src/v2ray.com/core/" || return
|
||||
|
||||
pushd $GOPATH/src/v2ray.com/core/
|
||||
# Update geoip.dat
|
||||
GEOIP_TAG=$(curl --silent "https://api.github.com/repos/v2ray/geoip/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
|
||||
curl -L -o release/config/geoip.dat "https://github.com/v2ray/geoip/releases/download/${GEOIP_TAG}/geoip.dat"
|
||||
@ -11,4 +11,5 @@ sleep 1
|
||||
GEOSITE_TAG=$(curl --silent "https://api.github.com/repos/v2ray/domain-list-community/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
|
||||
curl -L -o release/config/geosite.dat "https://github.com/v2ray/domain-list-community/releases/download/${GEOSITE_TAG}/dlc.dat"
|
||||
sleep 1
|
||||
popd
|
||||
|
||||
popd || return
|
||||
|
||||
Loading…
Reference in New Issue
Block a user