From b76ef283c5876044192fcf58a2792592a0b8fa91 Mon Sep 17 00:00:00 2001 From: Stuart Berg Date: Fri, 15 Jan 2021 16:56:18 -0500 Subject: [PATCH] conda-recipe: Don't pre-cache any third-party git repos, since the cached sources can become out-of-sync with the locations used by 'go get' --- scripts/conda-recipe/meta.yaml | 208 +++++++++++++++++---------------- scripts/get-go-dependencies.sh | 6 +- 2 files changed, 112 insertions(+), 102 deletions(-) diff --git a/scripts/conda-recipe/meta.yaml b/scripts/conda-recipe/meta.yaml index 51e644dc..aeb2ee34 100644 --- a/scripts/conda-recipe/meta.yaml +++ b/scripts/conda-recipe/meta.yaml @@ -85,6 +85,7 @@ source: git_tag: HEAD folder: src/github.com/janelia-flyem/dvid + # Janelia go packages - git_url: https://github.com/janelia-flyem/go git_tag: master @@ -100,56 +101,70 @@ source: git_tag: master folder: src/github.com/janelia-flyem/gojsonschema - # goji - - git_url: https://github.com/zenazn/goji + # protolog + - git_url: https://github.com/janelia-flyem/protolog git_tag: master - folder: src/github.com/zenazn/goji + folder: src/github.com/janelia-flyem/protolog - # go-jwt - git_url: https://github.com/dgrijalva/jwt-go - git_tag: master - folder: src/github.com/dgrijalva/jwt-go + + ## + ## We no longer use these cached locations by default, + ## since apparently sometimes the packages start using + ## new urls for their newer versions, but leave the old + ## versions up, making 'go get' sources different than + ## these cached urls. + ## + + # # goji + # - git_url: https://github.com/zenazn/goji + # git_tag: master + # folder: src/github.com/zenazn/goji + + # # go-jwt + # git_url: https://github.com/dgrijalva/jwt-go + # git_tag: master + # folder: src/github.com/dgrijalva/jwt-go # msgp # - git_url: https://github.com/tinylib/msgp # git_tag: master # folder: src/github.com/tinylib/msgp - # net - - git_url: https://go.googlesource.com/net - git_tag: master - folder: src/golang.org/x/net - # Includes: - # src/golang.org/x/net/context + # # net + # - git_url: https://go.googlesource.com/net + # git_tag: master + # folder: src/golang.org/x/net + # # Includes: + # # src/golang.org/x/net/context - # lumberjack - - git_url: https://gopkg.in/natefinch/lumberjack.v2 - git_tag: v2.0 - folder: src/gopkg.in/natefinch/lumberjack.v2 + # # lumberjack + # - git_url: https://gopkg.in/natefinch/lumberjack.v2 + # git_tag: v2.0 + # folder: src/gopkg.in/natefinch/lumberjack.v2 - # snappy - - git_url: https://github.com/golang/snappy - git_tag: master - folder: src/github.com/golang/snappy + # # snappy + # - git_url: https://github.com/golang/snappy + # git_tag: master + # folder: src/github.com/golang/snappy - # groupcache - - git_url: https://github.com/golang/groupcache - git_tag: master - folder: src/github.com/golang/groupcache + # # groupcache + # - git_url: https://github.com/golang/groupcache + # git_tag: master + # folder: src/github.com/golang/groupcache - # oauth2 - - git_url: https://go.googlesource.com/oauth2 - git_tag: master - folder: src/golang.org/x/oauth2 + # # oauth2 + # - git_url: https://go.googlesource.com/oauth2 + # git_tag: master + # folder: src/golang.org/x/oauth2 - # gcloud - - git_url: https://code.googlesource.com/gocloud - git_tag: master - folder: src/cloud.google.com/go - # Includes: - # cloud.google.com/go/compute/metadata - # cloud.google.com/go/bigtable - # cloud.google.com/go/storage + # # gcloud + # - git_url: https://code.googlesource.com/gocloud + # git_tag: master + # folder: src/cloud.google.com/go + # # Includes: + # # cloud.google.com/go/compute/metadata + # # cloud.google.com/go/bigtable + # # cloud.google.com/go/storage # - git_url: https://code.googlesource.com/google-api-go-client # git_tag: master @@ -157,32 +172,32 @@ source: # # Includes: # # src/google.golang.org/api/option - # grpc (not gorpc) - - git_url: https://github.com/grpc/grpc-go - git_tag: master - folder: src/google.golang.org/grpc + # # grpc (not gorpc) + # - git_url: https://github.com/grpc/grpc-go + # git_tag: master + # folder: src/google.golang.org/grpc - # gorpc (not grpc) - - git_url: https://github.com/valyala/gorpc - git_tag: master - folder: src/github.com/valyala/gorpc + # # gorpc (not grpc) + # - git_url: https://github.com/valyala/gorpc + # git_tag: master + # folder: src/github.com/valyala/gorpc - # protobuf (golang) - - git_url: https://github.com/golang/protobuf - git_tag: master - folder: src/github.com/golang/protobuf - # Includes: - # src/github.com/golang/protobuf/proto - # src/github.com/golang/protobuf/protoc-gen-go + # # protobuf (golang) + # - git_url: https://github.com/golang/protobuf + # git_tag: master + # folder: src/github.com/golang/protobuf + # # Includes: + # # src/github.com/golang/protobuf/proto + # # src/github.com/golang/protobuf/protoc-gen-go - # protobuf (gogo) - - git_url: https://github.com/gogo/protobuf - git_tag: master - folder: src/github.com/gogo/protobuf - # Includes: - # src/github.com/gogo/protobuf/proto - # src/github.com/gogo/protobuf/gogoproto - # src/github.com/gogo/protobuf/protoc-gen-gogoslick + # # protobuf (gogo) + # - git_url: https://github.com/gogo/protobuf + # git_tag: master + # folder: src/github.com/gogo/protobuf + # # Includes: + # # src/github.com/gogo/protobuf/proto + # # src/github.com/gogo/protobuf/gogoproto + # # src/github.com/gogo/protobuf/protoc-gen-gogoslick # # gofuse # - git_url: https://github.com/bazil/fuse @@ -194,47 +209,42 @@ source: # git_tag: master # folder: src/github.com/boltdb/bolt - # kafka - # NOTE: This is tied to the librdkafka version. - # If you change this tag, please also change it in scripts/get-go-dependencies.sh - - git_url: https://github.com/confluentinc/confluent-kafka-go - git_tag: v1.3.0 - folder: src/github.com/confluentinc/confluent-kafka-go + # # kafka + # # NOTE: This is tied to the librdkafka version. + # # If you change this tag, please also change it in scripts/get-go-dependencies.sh + # - git_url: https://github.com/confluentinc/confluent-kafka-go + # git_tag: v1.3.0 + # folder: src/github.com/confluentinc/confluent-kafka-go - # freecache - - git_url: https://github.com/coocood/freecache - git_tag: master - folder: src/github.com/coocood/freecache - - # Openstack Swift - - git_url: https://github.com/ncw/swift - git_tag: master - folder: src/github.com/ncw/swift - - # badger - - git_url: https://github.com/dgraph-io/badger - git_tag: v2.0.0 # Don't change this without also changing it in get-go-dependencies.sh!!! - folder: src/github.com/dgraph-io/badger - - # ristretto - - git_url: https://github.com/dgraph-io/ristretto - git_tag: v0.0.1 # Don't change this without also changing it in get-go-dependencies.sh!!! - folder: src/github.com/dgraph-io/ristretto - - # protolog - - git_url: https://github.com/janelia-flyem/protolog - git_tag: master - folder: src/github.com/janelia-flyem/protolog - - # go cloud dev kit - # - - git_url: https://github.com/google/go-cloud - git_tag: v0.19.0 - folder: src/gocloud.dev + # # freecache + # - git_url: https://github.com/coocood/freecache + # git_tag: master + # folder: src/github.com/coocood/freecache - - git_url: https://github.com/google/wire - git_tag: v0.4.0 - folder: src/github.com/google/wire + # # Openstack Swift + # - git_url: https://github.com/ncw/swift + # git_tag: master + # folder: src/github.com/ncw/swift + + # # badger + # - git_url: https://github.com/dgraph-io/badger + # git_tag: v2.0.0 # Don't change this without also changing it in get-go-dependencies.sh!!! + # folder: src/github.com/dgraph-io/badger + + # # ristretto + # - git_url: https://github.com/dgraph-io/ristretto + # git_tag: v0.0.1 # Don't change this without also changing it in get-go-dependencies.sh!!! + # folder: src/github.com/dgraph-io/ristretto + + # # go cloud dev kit + # # + # - git_url: https://github.com/google/go-cloud + # git_tag: v0.19.0 + # folder: src/gocloud.dev + + # - git_url: https://github.com/google/wire + # git_tag: v0.4.0 + # folder: src/github.com/google/wire # Also, we probably should add the following: # golang.org/x/xerrors diff --git a/scripts/get-go-dependencies.sh b/scripts/get-go-dependencies.sh index b7d17c9e..69aa9d9c 100755 --- a/scripts/get-go-dependencies.sh +++ b/scripts/get-go-dependencies.sh @@ -58,6 +58,9 @@ cd - # gojsonschema go get github.com/janelia-flyem/gojsonschema +# protolog -- for simple binary logging +go get github.com/janelia-flyem/protolog + # goji go get github.com/zenazn/goji @@ -103,9 +106,6 @@ go get github.com/gogo/protobuf/proto go get github.com/gogo/protobuf/gogoproto go get github.com/gogo/protobuf/protoc-gen-gogoslick -# protolog -- for simple binary logging -go get github.com/janelia-flyem/protolog - # gofuse # go get bazil.org/fuse