From 2317eaac1323f99e2822f99634703f68e3563685 Mon Sep 17 00:00:00 2001 From: David Hill Date: Fri, 6 Apr 2018 09:47:21 -0400 Subject: [PATCH] Bump for v1.2.0-rc1 (#138) --- .travis.yml | 11 +++- Gopkg.lock | 110 +++++++++++++++++++++++++++++++------ Gopkg.toml | 4 +- cmd/dcrinstall/settings.go | 4 +- cmd/dcrinstall/version.go | 4 +- goclean.sh | 35 ------------ 6 files changed, 109 insertions(+), 59 deletions(-) delete mode 100755 goclean.sh diff --git a/.travis.yml b/.travis.yml index 57ee3c1..8c1c97f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: go go: - - 1.8.x - 1.9.x + - 1.10.x sudo: false install: - go get -v github.com/golang/dep/cmd/dep @@ -11,4 +11,11 @@ install: - gometalinter --install script: - export PATH=$PATH:$HOME/gopath/bin - - ./goclean.sh + - gometalinter --vendor --disable-all --deadline=10m + --enable=gofmt + --enable=golint + --enable=vet + --enable=gosimple + --enable=unconvert + --enable=ineffassign + - env GORACE="halt_on_error=1" go test -race ./... diff --git a/Gopkg.lock b/Gopkg.lock index 6ef848a..f317ad8 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -4,8 +4,8 @@ [[projects]] name = "github.com/Microsoft/go-winio" packages = ["."] - revision = "78439966b38d69bf38227fbf57ac8a6fee70f69a" - version = "v0.4.5" + revision = "7da180ee92d8bd8bb8c37fc560e673e6557c392f" + version = "v0.4.7" [[projects]] name = "github.com/Sirupsen/logrus" @@ -16,7 +16,10 @@ [[projects]] branch = "master" name = "github.com/agl/ed25519" - packages = [".","edwards25519"] + packages = [ + ".", + "edwards25519" + ] revision = "5312a61534124124185d41f09206b9fef1d88403" [[projects]] @@ -53,21 +56,75 @@ branch = "master" name = "github.com/decred/base58" packages = ["."] - revision = "b3520e187fa8ebe65eb74245408cf4b83e6a65d3" + revision = "56c501706f00d9e1cfacee19a27117e12da24734" [[projects]] name = "github.com/decred/dcrd" - packages = ["blockchain","blockchain/indexers","blockchain/internal/dbnamespace","blockchain/internal/progresslog","blockchain/stake","blockchain/stake/internal/dbnamespace","blockchain/stake/internal/ticketdb","blockchain/stake/internal/tickettreap","chaincfg","chaincfg/chainec","chaincfg/chainhash","database","dcrec/edwards","dcrec/secp256k1","dcrec/secp256k1/schnorr","dcrjson","dcrutil","hdkeychain","mempool","mining","rpcclient","sampleconfig","txscript","wire"] - revision = "008e80bf8668544de4200a08927e95e5926439a0" + packages = [ + "blockchain", + "blockchain/indexers", + "blockchain/internal/dbnamespace", + "blockchain/internal/progresslog", + "blockchain/stake", + "blockchain/stake/internal/dbnamespace", + "blockchain/stake/internal/ticketdb", + "blockchain/stake/internal/tickettreap", + "chaincfg", + "chaincfg/chainec", + "chaincfg/chainhash", + "database", + "dcrec/edwards", + "dcrec/secp256k1", + "dcrec/secp256k1/schnorr", + "dcrjson", + "dcrutil", + "hdkeychain", + "mempool", + "mining", + "rpcclient", + "sampleconfig", + "txscript", + "wire" + ] + revision = "1329f871c1776ef047efe98312e1bf1f6b49027d" + version = "v1.2.0-rc1" [[projects]] name = "github.com/decred/dcrwallet" - packages = ["apperrors","internal/helpers","internal/prompt","internal/zero","loader","pgpwordlist","prompt","snacl","ticketbuyer","wallet","wallet/internal/txsizes","wallet/txauthor","wallet/txrules","wallet/udb","walletdb","walletdb/bdb","walletseed"] - revision = "0027db2f7a9fcce036af661938ff5a35727547a9" + packages = [ + "apperrors", + "internal/helpers", + "internal/prompt", + "internal/zero", + "loader", + "pgpwordlist", + "prompt", + "snacl", + "ticketbuyer", + "wallet", + "wallet/internal/txsizes", + "wallet/txauthor", + "wallet/txrules", + "wallet/udb", + "walletdb", + "walletdb/bdb", + "walletseed" + ] + revision = "a17b31f8234378d69d4498f484b9a96b61a459f6" + version = "v1.2.0-rc1" [[projects]] name = "github.com/docker/docker" - packages = ["pkg/archive","pkg/fileutils","pkg/idtools","pkg/ioutils","pkg/longpath","pkg/pools","pkg/promise","pkg/system"] + packages = [ + "pkg/archive", + "pkg/fileutils", + "pkg/idtools", + "pkg/ioutils", + "pkg/longpath", + "pkg/pools", + "pkg/promise", + "pkg/system" + ] revision = "eef6495eddab52828327aade186443681ed71a4e" version = "v17.03.2-ce-rc1" @@ -91,21 +148,39 @@ [[projects]] name = "github.com/opencontainers/runc" - packages = ["libcontainer/system","libcontainer/user"] + packages = [ + "libcontainer/system", + "libcontainer/user" + ] revision = "baf6536d6259209c3edfa2b22237af82942d3dfa" version = "v0.1.1" [[projects]] branch = "master" name = "golang.org/x/crypto" - packages = ["cast5","nacl/secretbox","openpgp","openpgp/armor","openpgp/elgamal","openpgp/errors","openpgp/packet","openpgp/s2k","pbkdf2","poly1305","ripemd160","salsa20/salsa","scrypt","ssh/terminal"] - revision = "94eea52f7b742c7cbe0b03b22f0c4c8631ece122" + packages = [ + "cast5", + "nacl/secretbox", + "openpgp", + "openpgp/armor", + "openpgp/elgamal", + "openpgp/errors", + "openpgp/packet", + "openpgp/s2k", + "pbkdf2", + "poly1305", + "ripemd160", + "salsa20/salsa", + "scrypt", + "ssh/terminal" + ] + revision = "c7dcf104e3a7a1417abc0230cb0d5240d764159d" [[projects]] branch = "master" name = "golang.org/x/net" packages = ["context"] - revision = "d866cfc389cec985d6fda2859936a575a55a3ab6" + revision = "d0aafc73d5cdc42264b0af071c261abac580695e" [[projects]] branch = "master" @@ -116,12 +191,15 @@ [[projects]] branch = "master" name = "golang.org/x/sys" - packages = ["unix","windows"] - revision = "53aa286056ef226755cd898109dbcdaba8ac0b81" + packages = [ + "unix", + "windows" + ] + revision = "7dca6fe1f43775aa6d1334576870ff63f978f539" [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "d41231ac29cf0e9b74c4f420bfb89d44acd4edd3b68950bf2e90ae91255060a3" + inputs-digest = "16ba1c0afe5d740817bf1eaa8de731fde2b299ed586cc6653e3210597798347b" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index 0b6589a..aa7b572 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -1,11 +1,11 @@ [[constraint]] name = "github.com/decred/dcrd" - revision = "008e80bf8668544de4200a08927e95e5926439a0" + version = "1.2.0-rc1" [[constraint]] name = "github.com/decred/dcrwallet" - revision = "0027db2f7a9fcce036af661938ff5a35727547a9" + version = "1.2.0-rc1" [[constraint]] name = "github.com/docker/docker" diff --git a/cmd/dcrinstall/settings.go b/cmd/dcrinstall/settings.go index b93dd60..6039bb9 100644 --- a/cmd/dcrinstall/settings.go +++ b/cmd/dcrinstall/settings.go @@ -17,8 +17,8 @@ import ( // latestVersion and latestManifest must be updated every release. const ( - latestManifest = "manifest-v1.1.2.txt" - defaultURI = "https://github.com/decred/decred-binaries/releases/download/v1.1.2" + latestManifest = "manifest-v1.2.0-rc1.txt" + defaultURI = "https://github.com/decred/decred-binaries/releases/download/v1.2.0-rc1" netMain = "mainnet" netTest = "testnet" diff --git a/cmd/dcrinstall/version.go b/cmd/dcrinstall/version.go index 7f818d0..bb4ce04 100644 --- a/cmd/dcrinstall/version.go +++ b/cmd/dcrinstall/version.go @@ -18,8 +18,8 @@ const semanticAlphabet = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqr // versioning 2.0.0 spec (http://semver.org/). const ( appMajor uint = 1 - appMinor uint = 1 - appPatch uint = 2 + appMinor uint = 2 + appPatch uint = 0 // appPreRelease MUST only contain characters from semanticAlphabet // per the semantic versioning spec. diff --git a/goclean.sh b/goclean.sh deleted file mode 100755 index 7aba6ef..0000000 --- a/goclean.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash -# The script does automatic checking on a Go package and its sub-packages, including: -# 1. gofmt (http://golang.org/cmd/gofmt/) -# 2. golint (https://github.com/golang/lint) -# 3. go vet (http://golang.org/cmd/vet) -# 4. gosimple (https://github.com/dominikh/go-simple) -# 5. unconvert (https://github.com/mdempsky/unconvert) -# 6. ineffassign (https://github.com/gordonklaus/ineffassign) -# 7. race detector (http://blog.golang.org/race-detector) -# 8. test coverage (http://blog.golang.org/cover) - -# gometaling (github.com/alecthomas/gometalinter) is used to run each each -# static checker. - -set -ex - -# Make sure gometalinter is installed and $GOPATH/bin is in your path. -# $ go get -v github.com/alecthomas/gometalinter" -# $ gometalinter --install" -if [ ! -x "$(type -p gometalinter)" ]; then - exit 1 -fi - -TESTDIRS=$(go list ./... | grep -v '/vendor/') -# Automatic checks -test -z "$(gometalinter --vendor --disable-all \ ---enable=gofmt \ ---enable=golint \ ---enable=vet \ ---enable=gosimple \ ---enable=unconvert \ ---enable=ineffassign \ ---deadline=20m ./... 2>&1 | tee /dev/stderr)" - -env GORACE="halt_on_error=1" go test -race ${TESTDIRS}