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.

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

Support ES 8.x #15

Merged
merged 7 commits into from
Jun 22, 2022
Merged
Changes from all commits
Commits
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
22 changes: 14 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,30 @@
version: 2.1

orbs:
node: circleci/node@1.1.6
node: circleci/node@5.0.2

parameters:
node_version:
type: string
default: '16.15.0'

commands:
install_deps:
steps:
- node/with-cache:
- node/install-packages:
pkg-manager: yarn
cache-version: v1-all
cache-key: package.json
dir: ~/repo/node_modules
use-strict-cache: true
steps:
- run: yarn install --pure-lockfile --no-progress
cache-only-lockfile: true
app-dir: ~/repo
override-ci-command: yarn install --pure-lockfile --no-progress
- run: sudo apt-get -q update && sudo apt-get -y install openjdk-17-jdk

jobs:
build:
executor:
name: node/default
tag: '14-browsers'
tag: << pipeline.parameters.node_version >>
working_directory: ~/repo
steps:
- checkout
- install_deps
2 changes: 1 addition & 1 deletion jest-es-config.js
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ const documentsMapping = require('./index-mapping');

module.exports = function getClusterSetting() {
return {
esVersion: '7.12.1',
esVersion: '8.2.0',
clusterName: 'docs',
nodeName: 'docs',
port: 9200,
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@
"preset": "./jest-preset.js"
},
"dependencies": {
"@shelf/elasticsearch-local": "2.3.0",
"@shelf/elasticsearch-local": "3.0.0",
"cwd": "0.10.0"
},
"devDependencies": {
@@ -58,7 +58,7 @@
"prettier": "2.3.0"
},
"engines": {
"node": ">=14"
"node": ">=16"
},
"publishConfig": {
"access": "public"
3 changes: 1 addition & 2 deletions src/search-by-term.test.js
Original file line number Diff line number Diff line change
@@ -23,8 +23,7 @@ describe('getDocuments', () => {
_source: {
id: 'some-doc-id-1',
name: 'some-name-1'
},
_type: '_doc'
}
}
],
totalCount: {
2 changes: 1 addition & 1 deletion teardown.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const {stop} = require('@shelf/elasticsearch-local');

module.exports = async function stopES() {
await stop();
stop();
};