Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support Node.js v14 #654

Merged
merged 3 commits into from
Jun 11, 2020
Merged

Support Node.js v14 #654

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
030758c
Support Node.js v14
ilammy Jun 11, 2020
0e0d3ba
Test with Node.js v14 on CircleCI too
ilammy Jun 11, 2020
71313d9
Merge branch 'master' into node.js-v14
ilammy Jun 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,7 @@ jobs:
nvm install v8
nvm install v10
nvm install v12
nvm install v14
# Install Emscripten toolchain for Wasm support
# See https://emscripten.org/docs/getting_started/downloads.html
- restore_cache:
Expand Down Expand Up @@ -505,7 +506,7 @@ jobs:
# Run JsThemis tests
make test_js
- run:
name: Test with Node.js v8 (maintenance)
name: Test with Node.js v8
when: always
command: |
# Activate Node.js v8
Expand All @@ -517,7 +518,7 @@ jobs:
# Run WasmThemis tests
make BUILD_PATH=build-wasm test_wasm
- run:
name: Test with Node.js v10 (LTS)
name: Test with Node.js v10
when: always
command: |
# Activate Node.js v10
Expand All @@ -529,7 +530,7 @@ jobs:
# Run WasmThemis tests
make BUILD_PATH=build-wasm test_wasm
- run:
name: Test with Node.js v12 (stable)
name: Test with Node.js v12
when: always
command: |
# Activate Node.js v12
Expand All @@ -540,6 +541,18 @@ jobs:
make test_js
# Run WasmThemis tests
make BUILD_PATH=build-wasm test_wasm
- run:
name: Test with Node.js v14
when: always
command: |
# Activate Node.js v14
nvm use v14
echo "node --version: $(node --version)"
echo "npm --version: $(npm --version)"
# Run JsThemis tests
make test_js
# Run WasmThemis tests
make BUILD_PATH=build-wasm test_wasm
- save_cache:
key: emscripten
paths:
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/test-nodejs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,10 @@ jobs:
strategy:
matrix:
node-version:
- 8.x # old LTS
- 10.x # current LTS
- 12.x # current stable
- 8.x # legacy
- 10.x # old LTS
- 12.x # current LTS
- 14.x # current stable
fail-fast: false
steps:
- name: Install system dependencies
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/test-wasm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,10 @@ jobs:
strategy:
matrix:
node-version:
- 8.x # old LTS
- 10.x # current LTS
- 12.x # current stable
- 8.x # legacy
- 10.x # old LTS
- 12.x # current LTS
- 14.x # current stable
fail-fast: false
steps:
- name: Install system dependencies
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,8 @@ _Code:_
- `SecureCell` now allows `null` to explicitly specify omitted encryption context ([#620](https://github.com/cossacklabs/themis/pull/620)).
- `SecureMessage` now allows `null` for omitted keys in sign/verify mode ([#620](https://github.com/cossacklabs/themis/pull/620)).
- Fixed a crash when an exception is thrown from `SecureSession` callback ([#620](https://github.com/cossacklabs/themis/pull/620)).
- Node.js v14 is now supported
([#654](https://github.com/cossacklabs/themis/issues/654)).

- Passphrase API support in Secure Cell ([#621](https://github.com/cossacklabs/themis/pull/621)).

Expand Down Expand Up @@ -652,6 +654,8 @@ _Code:_
- New class `SymmetricKey` can be used to generate symmetric keys for Secure Cell ([#561](https://github.com/cossacklabs/themis/pull/561)).
- Updated embedded BoringSSL to the latest version
([#643](https://github.com/cossacklabs/themis/pull/643)).
- Node.js v14 is now supported
([#654](https://github.com/cossacklabs/themis/issues/654)).

- Passphrase API support in Secure Cell ([#616](https://github.com/cossacklabs/themis/pull/616)).

Expand Down