grim/convey

merging

2018-02-19, Gary Kramlich
8c7af5e9a4cc
Parents fd15d21375957b5ccc461d0e
Children 7078e7170bcc47df081c14f8
merging
3 files changed, 5 insertions(+), 4 deletions(-)
  • +1 -0
    .hgtags
  • +1 -1
    consts/consts.go
  • +3 -3
    convey.yml
    • --- a/.hgtags Mon Feb 19 17:04:15 2018 -0600
    +++ b/.hgtags Mon Feb 19 17:04:37 2018 -0600
    @@ -22,3 +22,4 @@
    598a722a46781633fe1b28ac896e9e0469d8b82f v0.12.0
    7d242a198aa8449a0fe21f82818b2ceb5df30926 v0.13.0
    837098fd33e6b8b2d2891f4baac0bed190e8cc90 v0.13.1
    +335eaa5698de94ebd561dd518ee5ad79eabaf7dc v0.14.0-alpha1
    --- a/consts/consts.go Mon Feb 19 17:04:15 2018 -0600
    +++ b/consts/consts.go Mon Feb 19 17:04:37 2018 -0600
    @@ -18,5 +18,5 @@
    const (
    // Version is the current version of convey
    - Version = "0.14.0-dev"
    + Version = "0.14.0-alpha1"
    )
    --- a/convey.yml Mon Feb 19 17:04:15 2018 -0600
    +++ b/convey.yml Mon Feb 19 17:04:37 2018 -0600
    @@ -1,7 +1,7 @@
    ---
    -required-version: 0.14.0-dev
    +required-version: 0.14.0-alpha1
    environment:
    - - CONVEY_VERSION=0.14.0-dev
    + - CONVEY_VERSION=0.14.0-alpha1
    - GO_PACKAGE=bitbucket.org/rw_grim/convey
    tasks:
    # tasks for the default plan
    @@ -76,7 +76,7 @@
    type: docker/run
    image: convey/checksum
    environment:
    - - 'SHA256_FILES="convey-${CONVEY_VERSION}-linux-amd64 convey-${CONVEY_VERSION}-windows-amd64.exe convey-${CONVEY_VERSION}-darwin-amd64 convey-${CONVEY_VERSION}-alpine-amd64"'
    + - SHA256_FILES=convey-${CONVEY_VERSION}-linux-amd64 convey-${CONVEY_VERSION}-windows-amd64.exe convey-${CONVEY_VERSION}-darwin-amd64 convey-${CONVEY_VERSION}-alpine-amd64
    deploy-to-bitbucket:
    type: docker/run
    image: convey/bitbucket-upload