From 0b5f83e66853b8067d32c19addaab5799ecfdf2b Mon Sep 17 00:00:00 2001 From: Jonathan Bendes <jonathan@skyspecs.com> Date: Mon, 17 Aug 2020 13:33:38 -0400 Subject: [PATCH 1/3] Testing changelog --- .github/workflows/release.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 481630a2..68a8258d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 @@ -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 From bf8a28dc43cda2f4b150bdf2c857a8aa4856a77e Mon Sep 17 00:00:00 2001 From: Jonathan Bendes <jonathan@skyspecs.com> Date: Mon, 17 Aug 2020 13:43:37 -0400 Subject: [PATCH 2/3] Changelog to have bullets --- docs/changelog.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/changelog.md b/docs/changelog.md index 81b39fa1..08a56d04 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -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 From 7ea80eaed044a71ed753aed4df26cab6de201bcb Mon Sep 17 00:00:00 2001 From: Jonathan Bendes <jonathan@skyspecs.com> Date: Mon, 17 Aug 2020 13:57:00 -0400 Subject: [PATCH 3/3] Incremented node version one more time --- examples/node-client/package.json | 2 +- gen/version.h | 2 +- wscript | 10 +++++++--- zcm/js/node/package.json | 2 +- zcm/zcm.h | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/examples/node-client/package.json b/examples/node-client/package.json index e199a1f7..0b5cb95b 100644 --- a/examples/node-client/package.json +++ b/examples/node-client/package.json @@ -1,6 +1,6 @@ { "name": "zcm-example", - "version": "1.0.2", + "version": "1.0.3", "description": "", "scripts": { "//": [ diff --git a/gen/version.h b/gen/version.h index dbd0c245..ec61df58 100644 --- a/gen/version.h +++ b/gen/version.h @@ -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 diff --git a/wscript b/wscript index bf0de269..54333cd1 100644 --- a/wscript +++ b/wscript @@ -110,9 +110,10 @@ 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") @@ -120,6 +121,9 @@ def version(ctx): 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 diff --git a/zcm/js/node/package.json b/zcm/js/node/package.json index 7db65141..d3c84a9a 100644 --- a/zcm/js/node/package.json +++ b/zcm/js/node/package.json @@ -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", diff --git a/zcm/zcm.h b/zcm/zcm.h index bb151ddb..a65893d7 100644 --- a/zcm/zcm.h +++ b/zcm/zcm.h @@ -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>