Add GOPROXY fallback to RR edition builds
This commit is contained in:
@@ -18,6 +18,7 @@ jobs:
|
||||
timeout-minutes: 240
|
||||
env:
|
||||
DEBIAN_FRONTEND: noninteractive
|
||||
GOPROXY: https://proxy.golang.org|direct
|
||||
steps:
|
||||
- name: checkout
|
||||
uses: actions/checkout@v4
|
||||
@@ -229,12 +230,13 @@ jobs:
|
||||
|
||||
go version > "$GITHUB_WORKSPACE/logs/go-version.log" 2>&1
|
||||
command -v go > "$GITHUB_WORKSPACE/logs/go-bin.log" 2>&1
|
||||
go env GOPROXY > "$GITHUB_WORKSPACE/logs/go-proxy.log" 2>&1
|
||||
make defconfig > "$GITHUB_WORKSPACE/logs/sdk-defconfig.log" 2>&1
|
||||
|
||||
set +e
|
||||
# Clean first so the package rebuilds even when VERSION stays unchanged.
|
||||
make -j"$(nproc)" package/sing-box-rr/clean > "$GITHUB_WORKSPACE/logs/pkg-clean.log" 2>&1
|
||||
make -j"$(nproc)" package/sing-box-rr/compile V=s GO_BIN="$(command -v go)" > "$GITHUB_WORKSPACE/logs/pkg-build.log" 2>&1
|
||||
make -j"$(nproc)" package/sing-box-rr/compile V=s GO_BIN="$(command -v go)" SINGBOX_RR_GOPROXY="${GOPROXY}" > "$GITHUB_WORKSPACE/logs/pkg-build.log" 2>&1
|
||||
rc=$?
|
||||
if [ "$rc" -ne 0 ]; then
|
||||
tail -n 400 "$GITHUB_WORKSPACE/logs/pkg-build.log" || true
|
||||
|
||||
@@ -6,6 +6,7 @@ PROJECT_DIR="$SCRIPT_DIR/sing-box-rr"
|
||||
GO_BIN="${GO_BIN:-/usr/local/go/bin/go}"
|
||||
GO_CACHE_DIR="${GO_CACHE_DIR:-/tmp/sing-box-rr-go-build}"
|
||||
GO_MODCACHE_DIR="${GO_MODCACHE_DIR:-/tmp/sing-box-rr-go-mod}"
|
||||
GO_PROXY_VALUE="${GOPROXY:-https://proxy.golang.org|direct}"
|
||||
LD_LLD_BIN="${LD_LLD_BIN:-}"
|
||||
SDK_ARM64="/home/fresa/sdk/openwrt-sdk-25.12.4-mediatek-filogic_gcc-14.3.0_musl.Linux-x86_64"
|
||||
SDK_X86="/home/fresa/sdk/openwrt-sdk-25.12.4-x86-64_gcc-14.3.0_musl.Linux-x86_64"
|
||||
@@ -274,6 +275,7 @@ build_binary() {
|
||||
"GOTOOLCHAIN=local"
|
||||
"GOCACHE=$GO_CACHE_DIR"
|
||||
"GOMODCACHE=$GO_MODCACHE_DIR"
|
||||
"GOPROXY=$GO_PROXY_VALUE"
|
||||
"GOOS=linux"
|
||||
"GOARCH=$goarch"
|
||||
)
|
||||
|
||||
@@ -6,6 +6,7 @@ PROJECT_DIR="$SCRIPT_DIR/sing-box-rr"
|
||||
GO_BIN="${GO_BIN:-/usr/local/go/bin/go}"
|
||||
GO_CACHE_DIR="${GO_CACHE_DIR:-/tmp/sing-box-rr-go-build}"
|
||||
GO_MODCACHE_DIR="${GO_MODCACHE_DIR:-/tmp/sing-box-rr-go-mod}"
|
||||
GO_PROXY_VALUE="${GOPROXY:-https://proxy.golang.org|direct}"
|
||||
LD_LLD_BIN="${LD_LLD_BIN:-}"
|
||||
SDK_ARM64="/home/fresa/sdk/openwrt-sdk-24.10.4-mediatek-filogic_gcc-13.3.0_musl.Linux-x86_64"
|
||||
SDK_X86="/home/fresa/sdk/openwrt-sdk-24.10.4-x86-64_gcc-13.3.0_musl.Linux-x86_64"
|
||||
@@ -238,6 +239,7 @@ build_binary() {
|
||||
"GOTOOLCHAIN=local"
|
||||
"GOCACHE=$GO_CACHE_DIR"
|
||||
"GOMODCACHE=$GO_MODCACHE_DIR"
|
||||
"GOPROXY=$GO_PROXY_VALUE"
|
||||
"GOOS=linux"
|
||||
"GOARCH=$goarch"
|
||||
)
|
||||
|
||||
@@ -20,6 +20,7 @@ SINGBOX_RR_LD_LLD_BIN?=
|
||||
SINGBOX_RR_BUILT_BINARY=$(PKG_BUILD_DIR)/sing-box
|
||||
SINGBOX_RR_GOCACHE?=$(TMP_DIR)/sing-box-rr-go-build
|
||||
SINGBOX_RR_GOMODCACHE?=$(DL_DIR)/sing-box-rr-go-mod
|
||||
SINGBOX_RR_GOPROXY?=https://proxy.golang.org|direct
|
||||
SINGBOX_RR_TAGS:=$(shell tr -d '\n' < $(PROJECT_DIR)/release/DEFAULT_BUILD_TAGS_OTHERS 2>/dev/null)
|
||||
SINGBOX_RR_BASE_LDFLAGS:=$(shell tr -d '\n' < $(PROJECT_DIR)/release/LDFLAGS 2>/dev/null)
|
||||
SINGBOX_RR_LDFLAGS:=$(strip $(SINGBOX_RR_BASE_LDFLAGS) -X github.com/sagernet/sing-box/constant.Version=$(SINGBOX_RR_PROJECT_VERSION) -s -w)
|
||||
@@ -122,13 +123,14 @@ define Build/Compile
|
||||
env \
|
||||
$$$$cc_env \
|
||||
$$$$cxx_env \
|
||||
PATH="$(dir $(GO_BIN)):$$$$PATH" \
|
||||
GOTOOLCHAIN=local \
|
||||
GOCACHE="$(SINGBOX_RR_GOCACHE)" \
|
||||
GOMODCACHE="$(SINGBOX_RR_GOMODCACHE)" \
|
||||
CGO_ENABLED="$$$$use_cgo" \
|
||||
GOOS=linux \
|
||||
GOARCH="$(SINGBOX_RR_GOARCH)" \
|
||||
PATH="$(dir $(GO_BIN)):$$$$PATH" \
|
||||
GOTOOLCHAIN=local \
|
||||
GOCACHE="$(SINGBOX_RR_GOCACHE)" \
|
||||
GOMODCACHE="$(SINGBOX_RR_GOMODCACHE)" \
|
||||
GOPROXY="$(SINGBOX_RR_GOPROXY)" \
|
||||
CGO_ENABLED="$$$$use_cgo" \
|
||||
GOOS=linux \
|
||||
GOARCH="$(SINGBOX_RR_GOARCH)" \
|
||||
$(SINGBOX_RR_GOENV_EXTRA) \
|
||||
"$(GO_BIN)" build \
|
||||
-buildvcs=false \
|
||||
|
||||
Reference in New Issue
Block a user