github/across
1
0
Fork 0
mirror of https://github.com/teddysun/across.git synced 2025-01-31 20:29:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: github:cd89c3ddb6e515398f293fd12993112c2ce8eecf
Branches Tags
github:master
...
compare: github:6ba63a9f598ae7dbd2f8ab43358454fd2aaec7e9
Branches Tags
github:master

4 Commits
cd89c3ddb6 ... 6ba63a9f59

Author SHA1 Message Date
zhq
6ba63a9f59
Merge e76ceea3462024f47764922c5afc7f1235ae708a into 23dae9ce5afabd73702e3bc52f3b6682da3fb44f 2023-09-08 04:16:07 +08:00
Teddysun
23dae9ce5a
Update build_hysteria.sh 2023-09-02 15:06:22 +09:00
zhq
e76ceea346
Update bench.sh 2022-03-28 09:29:05 +08:00
zhq
6d95140d11
add cn 2022-03-28 09:28:24 +08:00
2 changed files with 19 additions and 9 deletions
Show Stats Expand all files Collapse all files

17
bench.sh
View File

@ -71,15 +71,24 @@ speed_test() {
speed() { speed() {
speed_test '' 'Speedtest.net' speed_test '' 'Speedtest.net'
speed_test '29071' 'Chengdu, CN'
speed_test '17584' 'Chongqing, CN'
speed_test '29105' 'Xi an, CN'
speed_test '28225' 'Changsha, CN'
speed_test '29353' 'Wuhan, CN'
speed_test '16145' 'Lanzhou, CN'
speed_test '3973' 'Lanzhou, CN'
speed_test '41910' 'Zhengzhou, CN'
speed_test '36996' 'Guiyang, CN'
speed_test '24447' 'Shanghai, CN'
speed_test '26352' 'Nanjing, CN'
speed_test '27594' 'Guangzhou, CN'
speed_test '32155' 'Hongkong, CN'
speed_test '21541' 'Los Angeles, US' speed_test '21541' 'Los Angeles, US'
speed_test '43860' 'Dallas, US' speed_test '43860' 'Dallas, US'
speed_test '40879' 'Montreal, CA' speed_test '40879' 'Montreal, CA'
speed_test '24215' 'Paris, FR' speed_test '24215' 'Paris, FR'
speed_test '28922' 'Amsterdam, NL' speed_test '28922' 'Amsterdam, NL'
speed_test '24447' 'Shanghai, CN'
speed_test '26352' 'Nanjing, CN'
speed_test '27594' 'Guangzhou, CN'
speed_test '32155' 'Hongkong, CN'
speed_test '6527' 'Seoul, KR' speed_test '6527' 'Seoul, KR'
speed_test '7311' 'Singapore, SG' speed_test '7311' 'Singapore, SG'
speed_test '21569' 'Tokyo, JP' speed_test '21569' 'Tokyo, JP'

11
docker/hysteria/build_hysteria.sh
View File

@ -4,7 +4,7 @@
# #
# Supported architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x # Supported architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
# #
# Copyright (C) 2022 Teddysun <i@teddysun.com> # Copyright (C) 2022 - 2023 Teddysun <i@teddysun.com>
# #
# Reference URL: # Reference URL:
# https://github.com/apernet/hysteria # https://github.com/apernet/hysteria
@ -23,11 +23,12 @@ echo "git clone https://github.com/apernet/hysteria.git"
git clone https://github.com/apernet/hysteria.git git clone https://github.com/apernet/hysteria.git
cd hysteria || exit 2 cd hysteria || exit 2
APP_SRC_CMD_PKG="github.com/apernet/hysteria/app/cmd"
VERSION="$(git describe)" VERSION="$(git describe)"
COMMIT="$(git rev-parse HEAD)" COMMIT="$(git rev-parse HEAD)"
TIMESTAMP="$(date "+%F")" TIMESTAMP="$(date "+%F")"
LDFLAGS="-s -w -X 'main.appVersion=${VERSION}' -X 'main.appCommit=${COMMIT}' -X 'main.appDate=${TIMESTAMP}' -buildid=" LDFLAGS="-s -w -X '${APP_SRC_CMD_PKG}.appVersion=${VERSION}' -X '${APP_SRC_CMD_PKG}.appCommit=${COMMIT}' -X '${APP_SRC_CMD_PKG}.appDate=${TIMESTAMP}' -X '${APP_SRC_CMD_PKG}.appType=release' -buildid="
ARCHS=( 386 amd64 arm arm64 ppc64le s390x ) ARCHS=( 386 amd64 arm arm64 ppc64le s390x )
ARMS=( 6 7 ) ARMS=( 6 7 )
@ -35,18 +36,18 @@ for ARCH in ${ARCHS[@]}; do
if [ "${ARCH}" = "arm" ]; then if [ "${ARCH}" = "arm" ]; then
for V in ${ARMS[@]}; do for V in ${ARMS[@]}; do
echo "Building hysteria_linux_${ARCH}${V}" echo "Building hysteria_linux_${ARCH}${V}"
env CGO_ENABLED=0 GOOS=linux GOARCH=${ARCH} GOARM=${V} go build -v -trimpath -ldflags "${LDFLAGS}" -o ${cur_dir}/hysteria_linux_${ARCH}${V} ./app/cmd || exit 1 env CGO_ENABLED=0 GOOS=linux GOARCH=${ARCH} GOARM=${V} go build -v -trimpath -ldflags "${LDFLAGS} -X '${APP_SRC_CMD_PKG}.appPlatform=linux' -X '${APP_SRC_CMD_PKG}.appArch=${ARCH}'" -o ${cur_dir}/hysteria_linux_${ARCH}${V} ./app || exit 1
done done
else else
echo "Building hysteria_linux_${ARCH}" echo "Building hysteria_linux_${ARCH}"
env CGO_ENABLED=0 GOOS=linux GOARCH=${ARCH} go build -v -trimpath -ldflags "${LDFLAGS}" -o ${cur_dir}/hysteria_linux_${ARCH} ./app/cmd || exit 1 env CGO_ENABLED=0 GOOS=linux GOARCH=${ARCH} go build -v -trimpath -ldflags "${LDFLAGS} -X '${APP_SRC_CMD_PKG}.appPlatform=linux' -X '${APP_SRC_CMD_PKG}.appArch=${ARCH}'" -o ${cur_dir}/hysteria_linux_${ARCH} ./app || exit 1
fi fi
done done
ARCHS=( 386 amd64 ) ARCHS=( 386 amd64 )
for ARCH in ${ARCHS[@]}; do for ARCH in ${ARCHS[@]}; do
echo "Building hysteria_windows_${ARCH}.exe" echo "Building hysteria_windows_${ARCH}.exe"
env CGO_ENABLED=0 GOOS=windows GOARCH=${ARCH} go build -v -trimpath -ldflags "${LDFLAGS}" -o ${cur_dir}/hysteria_windows_${ARCH}.exe ./app/cmd env CGO_ENABLED=0 GOOS=windows GOARCH=${ARCH} go build -v -trimpath -ldflags "${LDFLAGS} -X '${APP_SRC_CMD_PKG}.appPlatform=windows' -X '${APP_SRC_CMD_PKG}.appArch=${ARCH}'" -o ${cur_dir}/hysteria_windows_${ARCH}.exe ./app
done done
chmod +x ${cur_dir}/hysteria_* chmod +x ${cur_dir}/hysteria_*