Skip to content

Commit

Permalink
Release v1.0.7 (#40)
Browse files Browse the repository at this point in the history
- ci: use shared GHA workflows
- ci: add submodule .release
- es7: update index map template
  • Loading branch information
msimerson authored Jun 6, 2022
1 parent 7368883 commit bce7bc3
Show file tree
Hide file tree
Showing 12 changed files with 118 additions and 94 deletions.
10 changes: 10 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "weekly"
allow:
- dependency-type: production
47 changes: 0 additions & 47 deletions .github/workflows/ci-test.yml

This file was deleted.

50 changes: 50 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: CI

on: [ push ]

env:
CI: true

jobs:

lint:
uses: haraka/.github/.github/workflows/lint.yml@master

# coverage:
# uses: haraka/.github/.github/workflows/coverage.yml@master
# secrets: inherit

test:
needs: [ lint, get-lts ]
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ ubuntu-latest ]
node-version: ${{ fromJson(needs.get-lts.outputs.active) }}
fail-fast: false
steps:
- name: Configure sysctl limits
run: |
sudo swapoff -a
sudo sysctl -w vm.swappiness=1
sudo sysctl -w fs.file-max=262144
sudo sysctl -w vm.max_map_count=262144
- uses: miyataka/elasticsearch-github-actions@1
with:
stack-version: '7.6.2'
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
name: Node ${{ matrix.node-version }} on ${{ matrix.os }}
with:
node-version: ${{ matrix.node-version }}
- run: npm install
- run: npm test

get-lts:
runs-on: ubuntu-latest
steps:
- id: get
uses: msimerson/node-lts-versions@v1
outputs:
active: ${{ steps.get.outputs.active }}
lts: ${{ steps.get.outputs.lts }}
13 changes: 13 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: "CodeQL"

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]
schedule:
- cron: '18 7 * * 4'

jobs:
codeql:
uses: haraka/.github/.github/workflows/codeql.yml@master
33 changes: 0 additions & 33 deletions .github/workflows/lint.yml

This file was deleted.

14 changes: 14 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: publish

on:
push:
branches:
- master

env:
CI: true

jobs:
publish:
uses: haraka/.github/.github/workflows/publish.yml@master
secrets: inherit
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,5 @@ typings/
.env

package-lock.json

haraka-update.sh
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule ".release"]
path = .release
url = [email protected]:msimerson/.release.git
1 change: 1 addition & 0 deletions .release
Submodule .release added at 9be2b2
25 changes: 18 additions & 7 deletions Changes.md
Original file line number Diff line number Diff line change
@@ -1,42 +1,53 @@
### Unreleased

## 1.0.6 - 2020-07-21

### [1.0.7] - 2022-06-06

- ci: use shared GHA workflows
- ci: add submodule .release
- es7: update index map template


### 1.0.6 - 2020-07-21

- add URI for connection settings
- add options to specify user & ssl connection settings
- bump elasticsearch client to version 7.8


## 1.0.5 - 2020-04-29
### 1.0.5 - 2020-04-29

- update to upstream @elastic/elasticsearch@6
- convert test runner to mocha
- use GitHub actions instead of Travis & AppVeyor
- package.json: depend on latest eslint


## 1.0.4 - 2019-09-22
### 1.0.4 - 2019-09-22

- update index template for ES 6


## 1.0.3 - 2017-08-22
### 1.0.3 - 2017-08-22

- fix txr variable scope
- add tests for get_es_hosts


## 1.0.2 - 2017-07-29
### 1.0.2 - 2017-07-29

- also prune null values because typeof null === object
- add test storing doc against index template
- get ES testing working on AppVeyor (windows)


## 1.0.1 - 2017-07-29
### 1.0.1 - 2017-07-29

- qualify the path to plugin.\*.msg to avoid collision


## 1.0.0 - 2017-07-14
### 1.0.0 - 2017-07-14

- initial release

[1.0.7]: https://github.com/haraka/haraka-plugin-elasticsearch/releases/tag/1.0.7
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ curl -X PUT 'http://localhost:9200/_template/haraka_results' -H 'Content-Type: a


<!-- leave these buried at the bottom of the document -->
[ci-img]: https://github.com/haraka/haraka-plugin-elasticsearch/workflows/Unit%20Tests/badge.svg
[ci-url]: https://github.com/haraka/haraka-plugin-elasticsearch/actions?query=workflow%3A%22Unit+Tests%22
[ci-img]: https://github.com/haraka/haraka-plugin-elasticsearch/actions/workflows/ci.yml/badge.svg
[ci-url]: https://github.com/haraka/haraka-plugin-elasticsearch/actions/workflows/ci.yml
[clim-img]: https://codeclimate.com/github/haraka/haraka-plugin-elasticsearch/badges/gpa.svg
[clim-url]: https://codeclimate.com/github/haraka/haraka-plugin-elasticsearch
[npm-img]: https://nodei.co/npm/haraka-plugin-elasticsearch.png
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "haraka-plugin-elasticsearch",
"version": "1.0.6",
"version": "1.0.7",
"description": "Haraka plugin that saves logs to Elasticsearch",
"main": "index.js",
"scripts": {
"lint": "npx eslint *.js test/*.js",
"lintfix": "npx eslint --fix *.js test/*.js",
"lint": "npx eslint *.js test",
"lintfix": "npx eslint --fix *.js test",
"test": "npx mocha"
},
"repository": {
Expand All @@ -28,9 +28,9 @@
"haraka-utils": "*"
},
"devDependencies": {
"eslint": "*",
"eslint": ">=8",
"eslint-plugin-haraka": "*",
"haraka-test-fixtures": "*",
"mocha": "*"
"mocha": ">=9"
}
}

0 comments on commit bce7bc3

Please sign in to comment.