Skip to content

Commit

Permalink
Merge pull request #313 from ZeroCM/inf-release
Browse files Browse the repository at this point in the history
Inf release
  • Loading branch information
jbendes authored Aug 17, 2020
2 parents e0e7071 + 7ea80ea commit 4a2f010
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 18 deletions.
9 changes: 7 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,12 @@ jobs:
- name: Read CHANGELOG
id: changelog
run: |
echo "::set-output name=body::$(cat docs/changelog.md)"
CHANGELOG=$(cat docs/changelog.md) && \
CHANGELOG="${CHANGELOG//'%'/'%25'}" && \
CHANGELOG="${CHANGELOG//$'\n'/'%0A'}" && \
CHANGELOG="${CHANGELOG//$'\r'/'%0D'}" && \
export CHANGELOG && \
echo "::set-output name=body::$CHANGELOG"
- name: Create Release
id: create_release
uses: actions/create-release@latest
Expand All @@ -42,7 +47,7 @@ jobs:
tag_name: ${{ github.ref }}
release_name: Release ${{ github.ref }}
body: ${{ steps.changelog.outputs.body }}
draft: false
draft: true
prerelease: false
- name: Upload Deb
id: upload-release-asset
Expand Down
18 changes: 9 additions & 9 deletions docs/changelog.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Added python3 support
Dropped official python2 support, though it should still work
Building for arm (aarch64)
Untyped functional subscriptions in c++
Improved documentation
Added can transport based on socketcan
New zcm-logplayer-gui based on gtk3
Fixed lockfiles to unlock on all program exits
Node version upgrade to support new node versions
- Added python3 support
- Dropped official python2 support, though it should still work
- Building for arm (aarch64)
- Untyped functional subscriptions in c++
- Improved documentation
- Added can transport based on socketcan
- New zcm-logplayer-gui based on gtk3
- Fixed lockfiles to unlock on all program exits
- Node version upgrade to support new node versions
2 changes: 1 addition & 1 deletion examples/node-client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "zcm-example",
"version": "1.0.2",
"version": "1.0.3",
"description": "",
"scripts": {
"//": [
Expand Down
2 changes: 1 addition & 1 deletion gen/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@

#define ZCM_MAJOR_VERSION 1
#define ZCM_MINOR_VERSION 0
#define ZCM_MICRO_VERSION 2
#define ZCM_MICRO_VERSION 3

#endif
10 changes: 7 additions & 3 deletions wscript
Original file line number Diff line number Diff line change
Expand Up @@ -110,16 +110,20 @@ def processNodeVersion(ctx, f):
return version

def version(ctx):
versionNODE = processNodeVersion(ctx, 'zcm/js/node/package.json')
versionZCM = processCppVersion(ctx, 'zcm/zcm.h')
versionGEN = processCppVersion(ctx, 'gen/version.h')
versionNODE_EX = processNodeVersion(ctx, 'examples/node-client/package.json')
versionNODE = processNodeVersion(ctx, 'zcm/js/node/package.json')
versionZCM = processCppVersion(ctx, 'zcm/zcm.h')
versionGEN = processCppVersion(ctx, 'gen/version.h')

if versionZCM != versionGEN:
raise WafError("Version mismatch between core and zcm gen")

if versionZCM != versionNODE:
raise WafError("Version mismatch between core and nodejs")

if versionZCM != versionNODE_EX:
raise WafError("Version mismatch between core and nodejs")

Logs.pprint('RED','ZCM Version: %s' % (versionZCM))

return versionZCM
Expand Down
2 changes: 1 addition & 1 deletion zcm/js/node/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "zerocm",
"version": "1.0.2",
"version": "1.0.3",
"description": "Bindings to Zero Communications and Marshalling",
"dependencies": {
"big-integer": "^1.6.25",
Expand Down
2 changes: 1 addition & 1 deletion zcm/zcm.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ extern "C" {
*/
#define ZCM_MAJOR_VERSION 1
#define ZCM_MINOR_VERSION 0
#define ZCM_MICRO_VERSION 2
#define ZCM_MICRO_VERSION 3

#include <stdint.h>

Expand Down

0 comments on commit 4a2f010

Please sign in to comment.