From 301001f4ef109acf65453bb94c6425849ee575c9 Mon Sep 17 00:00:00 2001 From: bgme Date: Tue, 15 Aug 2023 00:04:04 +0800 Subject: [PATCH] fix sing-box-git fix sing-geosite --- repo/sing-box-git/PKGBUILD | 2 +- repo/sing-geosite/PKGBUILD | 2 +- repo/sing-geosite/lilac.yaml | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/repo/sing-box-git/PKGBUILD b/repo/sing-box-git/PKGBUILD index 8cf0137..ec04e86 100644 --- a/repo/sing-box-git/PKGBUILD +++ b/repo/sing-box-git/PKGBUILD @@ -37,7 +37,7 @@ sha256sums=( pkgver() { cd "${srcdir}/${_pkgname}" - git describe --tags --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-\([^-]*\)-\([^-]*\)$/.\1.\2/;s/-//' + git describe --tags --long | sed -E 's/([^-]*-g)/r\1/;s/-/./g;s/^v\.//' } _tags=with_gvisor,with_quic,with_dhcp,with_wireguard,with_utls,with_reality_server,with_clash_api,with_acme diff --git a/repo/sing-geosite/PKGBUILD b/repo/sing-geosite/PKGBUILD index 9f18f85..3c9d21d 100644 --- a/repo/sing-geosite/PKGBUILD +++ b/repo/sing-geosite/PKGBUILD @@ -19,7 +19,7 @@ build() { export NO_SKIP=true cd "${srcdir}/${pkgname}" - go run -v . + go1.19 run -v . } package() { diff --git a/repo/sing-geosite/lilac.yaml b/repo/sing-geosite/lilac.yaml index 89468ac..73008c5 100644 --- a/repo/sing-geosite/lilac.yaml +++ b/repo/sing-geosite/lilac.yaml @@ -2,6 +2,9 @@ maintainers: - github: yingziwu email: i@bgme.me +repo_depends: + - go1.19 + build_prefix: extra-x86_64 pre_build: vcs_update