Browse Source

glide: update lock and add util scripts

pull/259/head
Ethan Buchman 8 years ago
parent
commit
eac43dc62b
9 changed files with 63 additions and 6 deletions
  1. +6
    -6
      glide.lock
  2. +0
    -0
      scripts/debora/unsafe_debug_net.sh
  3. +0
    -0
      scripts/debora/unsafe_reset_net.sh
  4. +0
    -0
      scripts/debora/unsafe_start_group.sh
  5. +0
    -0
      scripts/debora/unsafe_stop_group.sh
  6. +0
    -0
      scripts/debora/unsafe_upgrade_barak.sh
  7. +0
    -0
      scripts/debora/unsafe_upgrade_group.sh
  8. +34
    -0
      scripts/glide/glide_status.sh
  9. +23
    -0
      scripts/glide/glide_update.sh

+ 6
- 6
glide.lock View File

@ -52,7 +52,7 @@ imports:
- name: github.com/tendermint/flowcontrol
version: 84d9671090430e8ec80e35b339907e0579b999eb
- name: github.com/tendermint/go-clist
version: 634527f5b60fd7c71ca811262493df2ad65ee0ca
version: 3baa390bbaf7634251c42ad69a8682e7e3990552
- name: github.com/tendermint/go-common
version: dee6622bf7f811d3ba8638a3f5ffaf8d679aa9d9
- name: github.com/tendermint/go-config
@ -62,9 +62,9 @@ imports:
- name: github.com/tendermint/go-db
version: 31fdd21c7eaeed53e0ea7ca597fb1e960e2988a5
- name: github.com/tendermint/go-events
version: 7b75ca7bb55aa25e9ef765eb8c0b69486b227357
version: 48fa21511b259278b871a37b6951da2d5bef698d
- name: github.com/tendermint/go-logger
version: 529efe50eab1a8a9c111d55f4de4ecd95f482761
version: cefb3a45c0bf3c493a04e9bcd9b1540528be59f2
- name: github.com/tendermint/go-merkle
version: 05042c6ab9cad51d12e4cecf717ae68e3b1409a8
- name: github.com/tendermint/go-p2p
@ -72,7 +72,7 @@ imports:
subpackages:
- upnp
- name: github.com/tendermint/go-rpc
version: 1d9e89812adc202811b7fb8e9e0837e73adadb43
version: dea910cd3e71bbfaf1973fd7ba295f0ee515a25f
subpackages:
- client
- server
@ -80,11 +80,11 @@ imports:
- name: github.com/tendermint/go-wire
version: 3b0adbc86ed8425eaed98516165b6788d9f4de7a
- name: github.com/tendermint/log15
version: 9545b249b3aacafa97f79e0838b02b274adc6f5f
version: 6e460758f10ef42a4724b8e4a82fee59aaa0e41d
subpackages:
- term
- name: github.com/tendermint/tmsp
version: 49a67aee8a7984a68eabe2c45ff6eb0ff51e31f9
version: ba11348508939e9d273cdc1cc476c5c611e14e66
subpackages:
- client
- example/dummy


scripts/unsafe_debug_net.sh → scripts/debora/unsafe_debug_net.sh View File


scripts/unsafe_reset_net.sh → scripts/debora/unsafe_reset_net.sh View File


scripts/unsafe_start_group.sh → scripts/debora/unsafe_start_group.sh View File


scripts/unsafe_stop_group.sh → scripts/debora/unsafe_stop_group.sh View File


scripts/unsafe_upgrade_barak.sh → scripts/debora/unsafe_upgrade_barak.sh View File


scripts/unsafe_upgrade_group.sh → scripts/debora/unsafe_upgrade_group.sh View File


+ 34
- 0
scripts/glide/glide_status.sh View File

@ -0,0 +1,34 @@
#! /bin/bash
# for every github.com/tendermint dependency, warn is if its not synced with origin/master
GLIDE=$1
# make list of libs
LIBS=($(grep "github.com/tendermint" $GLIDE | awk '{print $3}'))
for lib in "${LIBS[@]}"; do
# get vendored commit
VENDORED=`grep -A1 $lib $GLIDE | grep -v $lib | awk '{print $2}'`
PWD=`pwd`
cd $GOPATH/src/$lib
MASTER=`git rev-parse origin/master`
HEAD=`git rev-parse HEAD`
cd $PWD
if [[ "$VENDORED" != "$MASTER" ]]; then
echo ""
if [[ "$VENDORED" != "$HEAD" ]]; then
echo "Vendored version of $lib differs from origin/master and HEAD"
echo "Vendored: $VENDORED"
echo "Master: $MASTER"
echo "Head: $HEAD"
else
echo "Vendored version of $lib differs from origin/master but matches HEAD"
echo "Vendored: $VENDORED"
echo "Master: $MASTER"
fi
fi
done

+ 23
- 0
scripts/glide/glide_update.sh View File

@ -0,0 +1,23 @@
#! /bin/bash
set -euo pipefail
IFS=$'\n\t'
# script to update the given dependency in the glide.lock file with the checked out branch on the local host
GLIDE=$1
LIB=$2
# get vendored commit for given lib
function parseGlide() {
cat $1 | grep -A1 $2 | grep -v $2 | awk '{print $2}'
}
OLD_COMMIT=`parseGlide $GLIDE $LIB`
PWD=`pwd`
cd $GOPATH/src/github.com/tendermint/$LIB
NEW_COMMIT=$(git rev-parse HEAD)
cd $PWD
sed -i "s/$OLD_COMMIT/$NEW_COMMIT/g" $GLIDE

Loading…
Cancel
Save