Merge pull request #668 from slingamn/deps

Deps

DEVELOPING.md

@@ -23,22 +23,20 @@ Develop branches are either used to work out implementation details in preperati
 
 ## Releasing a new version
 
-1. Ensure dependencies are up-to-date.
+1. Run [`irctest`]() over it to make sure nothing's severely broken.
-2. Run [`irctest`]() over it to make sure nothing's severely broken.
+1. Update the changelog with new changes and write release notes.
-3. Remove `-unreleased` from the version number in `irc/constants.go`.
+1. Update the version number `irc/constants.go` (either change `-unreleased` to `-rc1`, or remove `-rc1`, as appropriate).
-4. Update the changelog with new changes.
+1. Commit the new changelog and constants change.
-5. Remove unused sections from the changelog, change the date/version number and write release notes.
+1. Tag the release with `git tag v0.0.0 -m "Release v0.0.0"` (`0.0.0` replaced with the real ver number).
-6. Commit the new changelog and constants change.
+1. Build binaries using `make release`, upload release to Github including the changelog and binaries.
-7. Tag the release with `git tag v0.0.0 -m "Release v0.0.0"` (`0.0.0` replaced with the real ver number).
+1. If it's a proper release (i.e. not an alpha/beta), merge the updates into the `stable` branch.
-8. Build binaries using `make release`, upload release to Github including the changelog and binaries.
+1. Make the appropriate announcements (Twitter, oragono.io/news)
-9. If it's a proper release (i.e. not an alpha/beta), merge the updates into the `stable` branch.
-10. Make the appropriate announcements (Twitter, oragono.io/news)
 
 Once it's built and released, you need to setup the new development version. To do so:
 
+1. Ensure dependencies are up-to-date.
 1. In `irc/constants.go`, update the version number to `0.0.1-unreleased`, where `0.0.1` is the previous release number with the minor field incremented by one (for instance, `0.9.2` -> `0.9.3-unreleased`).
-2. At the top of the changelog, paste a new section with the content below.
+1. Commit the new version number and changelog with the message `"Setup v0.0.1-unreleased devel ver"`.
-3. Commit the new version number and changelog with the message `"Setup v0.0.1-unreleased devel ver"`.
 
 **Unreleased changelog content**
 

Gopkg.lock

@@ -3,11 +3,11 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:d1a104572273cfb58e801812704dca4fe2eab80f3b0144592a722a76c280c598"
+  digest = "1:805d31e8de22d8be01b05e29eb3d1a02e512c9d437724372afe3e9cd45a1cf87"
   name = "code.cloudfoundry.org/bytefmt"
   packages = ["."]
   pruneopts = "UT"
-  revision = "2aa6f33b730c79971cfc3c742f279195b0abc627"
+  revision = "854d396b647c90b5a45646f9dcc2c9cd08ea8d51"
 
 [[projects]]
   branch = "master"
@@ -35,23 +35,23 @@
     "ircmsg",
   ]
   pruneopts = "UT"
-  revision = "c041b9aa6eac9f89e715d2c07aeac77f61aaa65e"
+  revision = "05ecc95249a0431980388ab092eaebca4c62fab9"
 
 [[projects]]
-  digest = "1:7c084e0e780596dd2a7e20d25803909a9a43689c153de953520dfbc0b0e51166"
+  digest = "1:4a29eeb25603debe8f2098a9902c4d3851034cf70d33be428826e86e8c30a1b0"
   name = "github.com/mattn/go-colorable"
   packages = ["."]
   pruneopts = "UT"
-  revision = "8029fb3788e5a4a9c00e415f586a6d033f5d38b3"
+  revision = "98ec13f34aabf44cc914c65a1cfb7b9bc815aef1"
-  version = "v0.1.2"
+  version = "v0.1.4"
 
 [[projects]]
-  digest = "1:9b90c7639a41697f3d4ad12d7d67dfacc9a7a4a6e0bbfae4fc72d0da57c28871"
+  digest = "1:d62282425ffb75047679d7e2c3b980eea7f82c05ef5fb9142ee617ebac6e7432"
   name = "github.com/mattn/go-isatty"
   packages = ["."]
   pruneopts = "UT"
-  revision = "1311e847b0cb909da63b5fecfb5370aa66236465"
+  revision = "88ba11cfdc67c7588b30042edf244b2875f892b6"
-  version = "v0.0.8"
+  version = "v0.0.10"
 
 [[projects]]
   branch = "master"
@@ -78,27 +78,27 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:3297205be37afe3f25875b99ad48babe2aebb6e0cf61631d6d9851ecb266370e"
+  digest = "1:75b14229739123696e5b75bdba078011229baf8f606362f3771cc6a861cefe67"
   name = "github.com/tidwall/btree"
   packages = ["."]
   pruneopts = "UT"
-  revision = "9876f1454cf0993a53d74c27196993e345f50dd1"
+  revision = "400434d76274d2bd5d2d8297d7d67f35a54fd5a0"
 
 [[projects]]
-  digest = "1:eb52960efb7c105ef572f84183de3e337ebbbb529a8efbe6bb4753a22aba4cc6"
+  digest = "1:f578aad894f832b60b752800c9c43a7c8e56229d4470d2a292871792ba7fb02b"
   name = "github.com/tidwall/buntdb"
   packages = ["."]
   pruneopts = "UT"
-  revision = "6249481c29c2cd96f53b691b74ac1893f72774c2"
+  revision = "eeb4b0a11d5828f744ffa39c652a5a24864be4b0"
-  version = "v1.1.0"
+  version = "v1.1.2"
 
 [[projects]]
-  digest = "1:7df351557a6d5c30804e7d6f7ed87f2fccb0619c08fcc84869a93f22bec96c11"
+  digest = "1:5a68167017eaa32aa408397806b9d69815244238ed774439a8863ef4bc329eeb"
   name = "github.com/tidwall/gjson"
   packages = ["."]
   pruneopts = "UT"
-  revision = "eee0b6226f0d1db2675a176fdfaa8419bcad4ca8"
+  revision = "c34bf81952c067718854115564f8e55978be5e1d"
-  version = "v1.2.1"
+  version = "v1.3.4"
 
 [[projects]]
   branch = "master"
@@ -145,7 +145,7 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:3abca04e0210167e21513c9f2c2914121ad04556a4f54eb56ca1059d53cc2d12"
+  digest = "1:ee7263bc4399e2ed4f28e3c9c2e661218d427e4e4e4501748080aae41e6942ba"
   name = "golang.org/x/crypto"
   packages = [
     "bcrypt",
@@ -154,11 +154,11 @@
     "ssh/terminal",
   ]
   pruneopts = "UT"
-  revision = "cc06ce4a13d484c0101a9e92913248488a75786d"
+  revision = "e1110fd1c708ef015366ea01799a23c459593c47"
 
 [[projects]]
   branch = "master"
-  digest = "1:7e3e63385ebe2dd5210be1534c516d8ae33c7ffac74126e5243d43ba7222e0d4"
+  digest = "1:5d507fb4c4f49b851691887afc8a5a547634186965f85209cc1f25a3ab6a6c57"
   name = "golang.org/x/sys"
   packages = [
     "cpu",
@@ -166,7 +166,7 @@
     "windows",
   ]
   pruneopts = "UT"
-  revision = "04f50cda93cbb67f2afa353c52f342100e80e625"
+  revision = "52ab431487773bc9dd1b0766228b1cf3944126bf"
 
 [[projects]]
   digest = "1:5f1559c4cee44069f81517430ebba19589869f3d4d4648213a4d5ddd199b11d8"
@@ -199,12 +199,12 @@
   version = "v0.3.2"
 
 [[projects]]
-  digest = "1:4d2e5a73dc1500038e504a8d78b986630e3626dc027bc030ba5c75da257cdb96"
+  digest = "1:f26a5d382387e03a40d1471dddfba85dfff9bf05352d7e42d37612677c4d3c5c"
   name = "gopkg.in/yaml.v2"
   packages = ["."]
   pruneopts = "UT"
-  revision = "51d6538a90f86fe93ac480b35f37b2be17fef232"
+  revision = "f90ceb4f409096b60e2e9076b38b304b8246e5fa"
-  version = "v2.2.2"
+  version = "v2.2.5"
 
 [solve-meta]
   analyzer-name = "dep"

irc/constants.go

@@ -9,7 +9,7 @@ import "fmt"
 
 const (
 	// SemVer is the semantic version of Oragono.
-	SemVer = "1.2.0"
+	SemVer = "1.3.0-unreleased"
 )
 
 var (

vendor

@@ -1 +1 @@
-Subproject commit 1deff6cdde9b4b20c9735e46ed6dd299b0fda9d3
+Subproject commit 153e95cc6a79ba6bcf179676214b11e74b883e16