Browse Source

update glide

pull/291/head
Ethan Buchman 8 years ago
parent
commit
9393be7a49
3 changed files with 10 additions and 5 deletions
  1. +4
    -4
      glide.lock
  2. +5
    -0
      scripts/glide/status.sh
  3. +1
    -1
      scripts/glide/update.sh

+ 4
- 4
glide.lock View File

@ -64,17 +64,17 @@ imports:
- name: github.com/tendermint/go-db - name: github.com/tendermint/go-db
version: 31fdd21c7eaeed53e0ea7ca597fb1e960e2988a5 version: 31fdd21c7eaeed53e0ea7ca597fb1e960e2988a5
- name: github.com/tendermint/go-events - name: github.com/tendermint/go-events
version: 48fa21511b259278b871a37b6951da2d5bef698d
version: 1652dc8b3f7780079aa98c3ce20a83ee90b9758b
- name: github.com/tendermint/go-logger - name: github.com/tendermint/go-logger
version: cefb3a45c0bf3c493a04e9bcd9b1540528be59f2 version: cefb3a45c0bf3c493a04e9bcd9b1540528be59f2
- name: github.com/tendermint/go-merkle - name: github.com/tendermint/go-merkle
version: 05042c6ab9cad51d12e4cecf717ae68e3b1409a8 version: 05042c6ab9cad51d12e4cecf717ae68e3b1409a8
- name: github.com/tendermint/go-p2p - name: github.com/tendermint/go-p2p
version: f508f3f20b5bb36f03d3bc83647b7a92425139d1
version: 1eb390680d33299ba0e3334490eca587efd18414
subpackages: subpackages:
- upnp - upnp
- name: github.com/tendermint/go-rpc - name: github.com/tendermint/go-rpc
version: 479510be0e80dd9e5d6b1f941adad168df0af85f
version: 855255d73eecd25097288be70f3fb208a5817d80
subpackages: subpackages:
- client - client
- server - server
@ -86,7 +86,7 @@ imports:
subpackages: subpackages:
- term - term
- name: github.com/tendermint/tmsp - name: github.com/tendermint/tmsp
version: ead192adbbbf85ac581cf775b18ae70d59f86457
version: 5d3eb0328a615ba55b580ce871033e605aa8b97d
subpackages: subpackages:
- client - client
- example/counter - example/counter


+ 5
- 0
scripts/glide/status.sh View File

@ -31,6 +31,11 @@ for lib in "${LIBS[@]}"; do
echo "Vendored: $VENDORED" echo "Vendored: $VENDORED"
echo "Master: $MASTER" echo "Master: $MASTER"
fi fi
elif [[ "$VENDORED" != "$HEAD" ]]; then
echo ""
echo "Vendored version of $lib matches origin/master but differs from HEAD"
echo "Vendored: $VENDORED"
echo "Head: $HEAD"
fi fi
done done


+ 1
- 1
scripts/glide/update.sh View File

@ -16,4 +16,4 @@ cd $GOPATH/src/github.com/tendermint/$LIB
NEW_COMMIT=$(git rev-parse HEAD) NEW_COMMIT=$(git rev-parse HEAD)
cd $PWD cd $PWD
sed -i "s/$OLD_COMMIT/$NEW_COMMIT/g" $GLIDE
sed -i "" "s/$OLD_COMMIT/$NEW_COMMIT/g" $GLIDE

Loading…
Cancel
Save