aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrevor Pering <peringknife@google.com>2019-03-01 11:18:45 -0800
committerTrevor Pering <peringknife@google.com>2019-03-01 11:18:45 -0800
commit8bdc5f3c28962716efb6edf1e8c00ab66588e7ca (patch)
treec5c95a4f32b8336361dce4beba53e0da2c1bdfb5
parent1bedccba9b5f5b765de7c1fcbae46fb51b07c97c (diff)
downloaddaq-release-0.9.4.tar.gz
daq-release-0.9.4.tar.bz2
daq-release-0.9.4.zip
release-0.9.4release-0.9.4
-rw-r--r--docs/changelog.md2
-rw-r--r--docs/releasing.md16
-rw-r--r--misc/RELEASE_VERSION2
3 files changed, 9 insertions, 11 deletions
diff --git a/docs/changelog.md b/docs/changelog.md
index 3efa840..eae5f73 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -1,6 +1,6 @@
# Changelog
-* Next Version
+* 0.9.4
* Faucet update to 1.8.35
* Move device configuration data under `site_path` parameter.
* Switch-based tests (port errors, port negotiation)
diff --git a/docs/releasing.md b/docs/releasing.md
index 26769c4..0940922 100644
--- a/docs/releasing.md
+++ b/docs/releasing.md
@@ -1,10 +1,10 @@
# Releasing Instructions
* Bring `release` branch to same version as `master`.
-* Determine new release version (e.g. `0.9.1`) updated from `misc/RELEASE_VERSION`.
-* Update and commit new version in `misc/RELEASE_VERSION`.
-* Update and commit entries in in `docs/changelog.md`.
-* Tag new version: `git tag -a -m "$(cat misc/RELEASE_VERSION)" release-$(cat misc/RELEASE_VERSION)`
+* Update new release version in `misc/RELEASE_VERSION`
+* Update/check headers and entries in in `docs/changelog.md`.
+* Commit changes using `git commit -a -m "release-$(cat misc/RELEASE_VERSION)"`
+* Tag new version: `git tag -a -m "release-$(cat misc/RELEASE_VERSION)" release-$(cat misc/RELEASE_VERSION)`
* Check latest commit log message:
<pre>
~/daq$ git log -n 1
@@ -14,9 +14,7 @@ Date: Tue Jan 29 11:45:12 2019 -0800
Release 0.9.1
</pre>
+* Push `release` branch, and verify Travis CI build completes successfully.
+* Switch to `master` branch and merge in `release` branch, push to upstream repo.
* Push release tags: `git push --tags`.
-* Push `release` branch.
-* Verify Travis CI build for `release` branch completes successfully.
-* Switch to `master` branch and merge in `release` branch.
-* Push `master` branch.
-* Make sure `master` branch _and tags_ are pushed to `faucetsdn` origin.
+* Push `master` and tags to any other origins (namely `faucetsdn/daq`).
diff --git a/misc/RELEASE_VERSION b/misc/RELEASE_VERSION
index 965065d..a602fc9 100644
--- a/misc/RELEASE_VERSION
+++ b/misc/RELEASE_VERSION
@@ -1 +1 @@
-0.9.3
+0.9.4