Skip to content

Commit

Permalink
sync with the last credit karma changes (#4)
Browse files Browse the repository at this point in the history
The Credit Karma thrift-server repo had some changes to get Node 14 working, so it seems like we should merge those into our fork before doing more work. I wasn't planning on publishing this version, just getting the changes in. The `package-lock.json` files were deleted on the Credit Karma repo, but I plan on recreating them soon once I've updated the dependencies and such.
  • Loading branch information
strmer15 authored Jan 12, 2022
2 parents 0de9637 + 483e513 commit a6d0f68
Show file tree
Hide file tree
Showing 37 changed files with 2,607 additions and 21,704 deletions.
24 changes: 13 additions & 11 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
defaults: &defaults
working_directory: ~/thrift-server
docker:
- image: circleci/node:8.9.4
- image: circleci/node:12.9.0

version: 2
jobs:
test_node_8:
test_node_14:
<<: *defaults
docker:
- image: circleci/node:14.16.0
steps:
- checkout
- run:
Expand All @@ -16,10 +18,10 @@ jobs:
name: Run Test Suite
command: npm test

test_node_10:
test_node_12:
<<: *defaults
docker:
- image: circleci/node:10.9.0
- image: circleci/node:12.9.0
steps:
- checkout
- run:
Expand Down Expand Up @@ -67,30 +69,30 @@ workflows:
version: 2
build_test:
jobs:
- test_node_8:
- test_node_12:
filters:
tags:
only: /.*/

- test_node_10:
- test_node_14:
filters:
tags:
only: /.*/

- publish:
requires:
- test_node_8
- test_node_10
- test_node_12
- test_node_14
filters:
tags:
only: /^(v){1}(0){1}(\.16){1}(\.[0-9]+){1}$/
only: /^(v){1}(0){1}(\.17){1}(\.[0-9]+){1}$/
branches:
ignore: /.*/

- publish_next:
requires:
- test_node_8
- test_node_10
- test_node_12
- test_node_14
filters:
tags:
only: /^(v){1}(0){1}(\.[0-9]+){1}(\.[0-9]+){1}(-alpha){1}\.[0-9]+$/
Expand Down
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,21 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

<a name="0.17.0"></a>
## [0.17.0](https://github.com/creditkarma/thrift-server/compare/v0.16.1...v0.17.0) (2020-04-02)

### BREAKING CHANGES

* Upgrade to using Hapi v20 ([ad1c86](https://github.com/creditkarma/thrift-server/pull/161)). This requires services to operate on node >= v12.


<a name="0.16.1"></a>
## [0.16.1](https://github.com/creditkarma/thrift-server/compare/v0.16.0...v0.16.1) (2020-05-20)

### Features
* Injectable request object([370a0c](https://github.com/creditkarma/thrift-server/pull/131))


<a name="0.16.0"></a>
## [0.16.0](https://github.com/creditkarma/thrift-server/compare/v0.15.3...v0.16.0) (2020-01-21)

Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"lerna": "3.14.1",
"version": "0.16.1",
"version": "0.17.2",
"loglevel": "verbose",
"packages": [
"packages/*"
Expand Down
Loading

0 comments on commit a6d0f68

Please sign in to comment.