diff --git a/testing/gx/APKBUILD b/testing/gx/APKBUILD index b0ecc8d44e2..a94f01d30a9 100644 --- a/testing/gx/APKBUILD +++ b/testing/gx/APKBUILD @@ -2,38 +2,27 @@ # Maintainer: Oleg Titov pkgname=gx pkgver=0.14.3 -pkgrel=8 +pkgrel=9 pkgdesc="Packaging tool build around the distributed, content addressed filesystem IPFS" url="https://github.com/whyrusleeping/gx" arch="all" license="MIT" -options="!check chmod-clean" # Test suite issues -makedepends="git glide go" +options="!check net" # Test suite issues +makedepends="go" subpackages="$pkgname-doc" -source="$pkgname-$pkgver.tar.gz::https://github.com/whyrusleeping/gx/archive/v$pkgver.tar.gz - glide.yaml - glide.lock - " -builddir="$srcdir/src/github.com/whyrusleeping/$pkgname" +source="$pkgname-$pkgver.tar.gz::https://github.com/whyrusleeping/gx/archive/v$pkgver.tar.gz" export GOCACHE="$srcdir/go-cache" export GOTMPDIR="$srcdir" export GOMODCACHE="$srcdir/go" prepare() { - export GOPATH="$srcdir" - - mkdir -p $(dirname $builddir) - mv "$srcdir"/$pkgname-$pkgver "$builddir"/ - - cp "$srcdir"/glide.yaml "$srcdir"/glide.lock "$builddir" - default_prepare + go mod download } build() { - glide install --skip-test - GOPATH="$srcdir" GOBIN="$GOPATH/bin" make + make } package() { @@ -41,19 +30,6 @@ package() { install -Dm 644 -t "$pkgdir/usr/share/licenses/gx" LICENSE } -glide_init() { - abuild clean deps unpack prepare - cd "$builddir" - export GOPATH="$startdir" - rm -f glide.yaml glide.lock - glide init --non-interactive - glide update - cp glide.yaml glide.lock "$startdir" - cd "$startdir" && abuild checksum clean -} - sha512sums=" 14280680254aea69b1295e625788b39404a77defdcdd47399529ee818695965c06c6001de8adb0a44f641e66f9386ca9da3fc2c56a038c4b96a8ddd6252c3d49 gx-0.14.3.tar.gz -b1ac1cdd2ed760072cab4d63876ad711407bc467bee37ee3740b477f1071a13e0086afef99d15cb9267634ca8496aa92d1a1b399fc99f0479336433c9212810d glide.yaml -6ddf9614c4244258191f0ba7fe1e41d5f84981795a71edc1f3d117f7ec72f1928d887a2dd9aecdb78c7cdac6c04eedf09e2e0af79f6049c337e122b5c7ac5ee7 glide.lock " diff --git a/testing/gx/glide.lock b/testing/gx/glide.lock deleted file mode 100644 index 57726fe30b3..00000000000 --- a/testing/gx/glide.lock +++ /dev/null @@ -1,84 +0,0 @@ -hash: c90dd949f9035c5c1ecd184c4eaf04c28fbf02fbc3a30f036a68f15121a29c88 -updated: 2019-03-27T16:14:37.014733407-06:00 -imports: -- name: github.com/blang/semver - version: 3c1074078d32d767e08ab2c8564867292da86926 -- name: github.com/btcsuite/btcd - version: aa6e0f35703c1438cc45860ddc0c3f6e6c633c93 - subpackages: - - btcec -- name: github.com/gogo/protobuf - version: 382325bbbb4d1c850eec1f3ec92a1a16f502d68b - subpackages: - - proto -- name: github.com/gxed/hashland - version: a72cc0875a1e95edd309d3134bc7c11bf2d7360b - subpackages: - - keccakpg - - murmur3 -- name: github.com/ipfs/go-ipfs-api - version: 26337195b3df044934572dc3ca9ccb175ce057b2 - subpackages: - - options -- name: github.com/ipfs/go-ipfs-files - version: c68472a9b1ec45177ccf8fda607698c86ae0060f -- name: github.com/libp2p/go-flow-metrics - version: 5b4a5750cdd34754b1a417b4c7c7d1c24790b4d4 -- name: github.com/libp2p/go-libp2p-crypto - version: b0ed0e663e8b6832bad3f4502b2f6551ff2686cd - subpackages: - - pb -- name: github.com/libp2p/go-libp2p-metrics - version: a64ed6c7351276b3f21cbfa033ceba9bd096c3af -- name: github.com/libp2p/go-libp2p-peer - version: 96d6d7940e6fc555240a92d1b4615049cd451da2 -- name: github.com/libp2p/go-libp2p-protocol - version: 89147e29c7ab3b76c6f8be5b6fcdf3839aec286f -- name: github.com/minio/blake2b-simd - version: 3f5f724cb5b182a5c278d6d3d55b40e7f8c2efb4 -- name: github.com/minio/sha256-simd - version: 05b4dd3047e5d6e86cb4e0477164b850cd896261 -- name: github.com/mitchellh/go-homedir - version: af06845cf3004701891bf4fdb884bfe4920b3727 -- name: github.com/mr-tron/base58 - version: 6598572f05537592acb5a609ff53c4c7fbba7a3e - subpackages: - - base58 -- name: github.com/multiformats/go-multiaddr - version: ce21123d5172669bbf37a166078bc5f9d345ec2f -- name: github.com/multiformats/go-multiaddr-dns - version: 7d0de25ce05c9294aa44f320c03c7e85e11bbb0b -- name: github.com/multiformats/go-multiaddr-net - version: bd61b0499a3cfc893a8eb109c5669342b1671881 -- name: github.com/multiformats/go-multihash - version: 2ca70e715b6950a9382097b770a3f44fd570d388 -- name: github.com/sabhiram/go-gitignore - version: d3107576ba9425fc1c85f4b3569c4631b805a02e -- name: github.com/urfave/cli - version: 693af58b4d51b8fcc7f9d89576da170765980581 -- name: github.com/whyrusleeping/gx - version: ca314b1e9e6be0432e50a30737c0e0720e67dd0f - subpackages: - - gxutil -- name: github.com/whyrusleeping/json-filter - version: ff25329a9528f01c5175414f16cc0a6a162a5b8b -- name: github.com/whyrusleeping/progmeter - version: f3e57218a75b913eff88d49a52c1debf9684ea04 -- name: github.com/whyrusleeping/stump - version: 206f8f13aae1697a6fc1f4a55799faf955971fc5 -- name: github.com/whyrusleeping/tar-utils - version: 8c6c8ba81d5c71fd69c0f48dbde4b2fb422b6dfc -- name: golang.org/x/crypto - version: a5d413f7728c81fb97d96a2b722368945f651e78 - subpackages: - - blake2s - - ed25519 - - ed25519/internal/edwards25519 - - sha3 -- name: golang.org/x/sys - version: f49334f85ddcf0f08d7fb6dd7363e9e6d6b777eb - subpackages: - - cpu - - unix - - windows -testImports: [] diff --git a/testing/gx/glide.yaml b/testing/gx/glide.yaml deleted file mode 100644 index dea832a0ea8..00000000000 --- a/testing/gx/glide.yaml +++ /dev/null @@ -1,16 +0,0 @@ -package: src/github.com/whyrusleeping/gx -import: -- package: github.com/blang/semver -- package: github.com/ipfs/go-ipfs-api -- package: github.com/mitchellh/go-homedir -- package: github.com/multiformats/go-multiaddr -- package: github.com/multiformats/go-multiaddr-net -- package: github.com/multiformats/go-multihash -- package: github.com/sabhiram/go-gitignore -- package: github.com/urfave/cli -- package: github.com/whyrusleeping/gx - subpackages: - - gxutil -- package: github.com/whyrusleeping/json-filter -- package: github.com/whyrusleeping/progmeter -- package: github.com/whyrusleeping/stump