Skip to content

Commit 9caa0b7

Browse files
jsumnersgurgunday
andauthored
Merge next into master (#111)
* update * fix equal * remove 21 * centralize workflow * typo * revert version * bump * typo Co-authored-by: Gürgün Dayıoğlu <[email protected]>
1 parent 6845879 commit 9caa0b7

File tree

3 files changed

+13
-75
lines changed

3 files changed

+13
-75
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -16,70 +16,8 @@ on:
1616
- '*.md'
1717

1818
jobs:
19-
dependency-review:
20-
name: Dependency Review
21-
if: github.event_name == 'pull_request'
22-
runs-on: ubuntu-latest
23-
permissions:
24-
contents: read
25-
steps:
26-
- name: Check out repo
27-
uses: actions/checkout@v4
28-
with:
29-
persist-credentials: false
30-
31-
- name: Dependency review
32-
uses: actions/dependency-review-action@v4
33-
3419
test:
35-
runs-on: ubuntu-latest
36-
permissions:
37-
contents: read
38-
strategy:
39-
matrix:
40-
node-version: [14, 16, 18, 20]
41-
steps:
42-
- name: Check out repo
43-
uses: actions/checkout@v4
44-
with:
45-
persist-credentials: false
46-
47-
- name: Setup Node ${{ matrix.node-version }}
48-
uses: actions/setup-node@v4
49-
with:
50-
node-version: ${{ matrix.node-version }}
51-
52-
- name: Configure sysctl limits
53-
run: |
54-
sudo swapoff -a
55-
sudo sysctl -w vm.swappiness=1
56-
sudo sysctl -w fs.file-max=262144
57-
sudo sysctl -w vm.max_map_count=262144
58-
59-
- name: Runs Elasticsearch
60-
uses: elastic/elastic-github-actions/elasticsearch@562b8b6ae4677da97273ff6bc4d630ce96ecbaa5
61-
with:
62-
stack-version: 8.3.2
63-
security-enabled: false
64-
65-
- name: Install dependencies
66-
run: npm i --ignore-scripts
67-
68-
- name: Run tests
69-
run: npm test
70-
71-
automerge:
72-
name: Automerge Dependabot PRs
73-
if: >
74-
github.event_name == 'pull_request' &&
75-
github.event.pull_request.user.login == 'dependabot[bot]'
76-
needs: test
77-
permissions:
78-
pull-requests: write
79-
contents: write
80-
runs-on: ubuntu-latest
81-
steps:
82-
- uses: fastify/github-action-merge-dependabot@v3
83-
with:
84-
github-token: ${{ secrets.GITHUB_TOKEN }}
85-
target: major
20+
uses: fastify/workflows/.github/workflows/[email protected]
21+
with:
22+
lint: true
23+
license-check: true

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@
2929
},
3030
"homepage": "https://github.com/fastify/fastify-elasticsearch#readme",
3131
"dependencies": {
32-
"@elastic/elasticsearch": "^8.2.1",
33-
"fastify-plugin": "^4.0.0"
32+
"@elastic/elasticsearch": "^8.13.1",
33+
"fastify-plugin": "^4.5.1"
3434
},
3535
"devDependencies": {
36-
"@types/node": "^20.1.0",
37-
"@fastify/pre-commit": "^2.0.2",
38-
"fastify": "^4.0.0-rc.2",
39-
"standard": "^17.0.0",
40-
"tap": "^16.0.0",
36+
"@types/node": "^20.12.7",
37+
"@fastify/pre-commit": "^2.1.0",
38+
"fastify": "^4.26.2",
39+
"standard": "^17.1.0",
40+
"tap": "^18.7.2",
4141
"tsd": "^0.31.0"
4242
},
4343
"publishConfig": {

test/index.test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ test('namespaced', async t => {
5353
})
5454

5555
await fastify.ready()
56-
t.strictEqual(fastify.elastic.cluster.name, 'elasticsearch-js')
56+
t.equal(fastify.elastic.cluster.name, 'elasticsearch-js')
5757
t.equal(isElasticsearchClient(fastify.elastic), false)
5858
t.equal(isElasticsearchClient(fastify.elastic.cluster), true)
5959
await fastify.close()
@@ -92,7 +92,7 @@ test('custom client', async t => {
9292

9393
await fastify.ready()
9494
t.equal(isElasticsearchClient(fastify.elastic), true)
95-
t.strictEqual(fastify.elastic.name, 'custom')
95+
t.equal(fastify.elastic.name, 'custom')
9696
await fastify.close()
9797
})
9898

0 commit comments

Comments
 (0)