[arch-commits] Commit in aliyun-cli/trunk (PKGBUILD)

[Levente Polyak via arch-commits]

    Date: Monday, May 3, 2021 @ 09:34:45
  Author: anthraxx
Revision: 926847

upgpkg: aliyun-cli 3.0.74-1

Modified:
  aliyun-cli/trunk/PKGBUILD

----------+
 PKGBUILD |   44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2021-05-03 09:33:48 UTC (rev 926846)
+++ PKGBUILD    2021-05-03 09:34:45 UTC (rev 926847)
@@ -2,8 +2,8 @@
 # Contributor: Andreas 'Segaja' Schleifer <archlinux at segaja dot de>
 
 pkgname=aliyun-cli
-pkgver=3.0.73
-_aliyun_openapi_meta_commit=7c6b451e55c7ada812b88c032c1048a3d9c4cd12
+_gitcommit=06016bfcd98fa546f81a0d3bbbc119ffcab0f132
+pkgver=3.0.74
 pkgrel=1
 pkgdesc='Alibaba Cloud CLI'
 arch=('x86_64')
@@ -11,38 +11,40 @@
 license=('APACHE')
 depends=('glibc' 'jq')
 makedepends=('git' 'go' 'go-bindata')
-source=(${url}/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz
-        
"git+https://github.com/aliyun/aliyun-openapi-meta#commit=${_aliyun_openapi_meta_commit}";)
-sha512sums=('4c1b4f88fef19d7d94a05b3c58be837eeefb8a6d935fe35f7861fd74828a62aef20c2fd90f71550dbcfe48f23bc667cd3e54de6fd99ac2074eb1539765d1d039'
+source=("git+${url}#commit=${_gitcommit}"
+        git+https://github.com/aliyun/aliyun-openapi-meta)
+sha512sums=('SKIP'
             'SKIP')
-b2sums=('d396656a8192763e56190c2968e073665b7e0be0c5b7047b38d8ab8547a3cf6ad8002b6523f2c06b80e59e2206e7d4e35784659046e3e5b76530accddb0f6169'
+b2sums=('SKIP'
         'SKIP')
 
+pkgver() {
+  cd ${pkgname}
+  git describe --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
 prepare() {
-  export GOPATH="${srcdir}/go"
-
-  mkdir -p "${GOPATH}/src/github.com/aliyun"
-  ln -rTsf "${pkgname}-${pkgver}" "${GOPATH}/src/github.com/aliyun/${pkgname}"
-  ln -rTsf aliyun-openapi-meta 
"${GOPATH}/src/github.com/aliyun/aliyun-openapi-meta"
+  cd ${pkgname}
+  git submodule init
+  git config submodule."aliyun-openapi-meta".url 
"${srcdir}/aliyun-openapi-meta"
+  git submodule update --recursive
 }
 
 build() {
-  export GOPATH="${srcdir}/go"
-  export PATH="${GOPATH}/bin:${PATH}"
-
-  cd "${GOPATH}/src/github.com/aliyun/${pkgname}"
-
+  cd ${pkgname}
   export CGO_LDFLAGS="${LDFLAGS}"
   export CGO_CPPFLAGS="${CPPFLAGS}"
   export CGO_CFLAGS="${CFLAGS}"
   export CGO_CXXFLAGS="${CXXFLAGS}"
-  export GOFLAGS="-buildmode=pie -trimpath -mod=vendor -modcacherw 
-ldflags=-linkmode=external"
+  export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw 
-ldflags=-linkmode=external"
 
+  echo "generating bindata..."
   go-bindata \
       -o resource/metas.go \
       -pkg resource \
-      ../aliyun-openapi-meta/...
+      ./aliyun-openapi-meta/...
 
+  echo "building..."
   go build \
     -ldflags "-linkmode=external -extldflags '${LDFLAGS}' -X 
'github.com/aliyun/aliyun-cli/cli.Version=${pkgver}'" \
     -o ./out/aliyun ./main/main.go
@@ -49,10 +51,8 @@
 }
 
 check() {
-  export GOPATH="${srcdir}/go"
+  cd ${pkgname}
 
-  cd "${GOPATH}/src/github.com/aliyun/${pkgname}"
-
   # Horrible but needed for the ./cli/ tests
   touch "${HOME}/.bashrc"
 
@@ -62,7 +62,7 @@
 }
 
 package() {
-  cd "${GOPATH}/src/github.com/aliyun/${pkgname}"
+  cd ${pkgname}
   install -Dm 755 out/aliyun "${pkgdir}/usr/bin/aliyun"
   install -Dm 644 README*.md CHANGELOG.md -t 
"${pkgdir}/usr/share/doc/${pkgname}"
   install -Dm 644 bin/README.md -t "${pkgdir}/usr/share/doc/${pkgname}/bin"