Skip to content

Commit

Permalink
release 2.2.1 (#36)
Browse files Browse the repository at this point in the history
- chore(ci): depend on shared GHA workflows
  • Loading branch information
msimerson authored May 28, 2022
1 parent f8c1ee6 commit 919b84f
Show file tree
Hide file tree
Showing 11 changed files with 96 additions and 125 deletions.
1 change: 0 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,3 @@ Checklist:
- [ ] tests updated
- [ ] Changes.md updated
- [ ] package.json.version bumped
- [x] published to NPM (automatic, upon merge to master)
39 changes: 0 additions & 39 deletions .github/workflows/ci-test.yml

This file was deleted.

57 changes: 57 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
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
runs-on: ${{ matrix.os }}
services:
redis:
image: redis
ports:
- 6379:6379
strategy:
matrix:
os: [ ubuntu-latest ]
node-version: [ 14, 16, 18 ]
fail-fast: false
steps:
- 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

test-win:
needs: lint
if: ${{ false }} # needs redis server
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ windows-latest ]
node-version: [ 14, 16, 18 ]
fail-fast: false
steps:
- 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
14 changes: 14 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: CodeQL

on:
push:
branches: [ master ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ master ]
schedule:
- cron: '18 7 * * 4'

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

This file was deleted.

48 changes: 0 additions & 48 deletions .github/workflows/master.yml

This file was deleted.

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

on:
push:
branches:
- master
paths:
- package.json

env:
CI: true

jobs:
publish:
uses: haraka/.github/.github/workflows/publish.yml@master
secrets: inherit
5 changes: 5 additions & 0 deletions Changes.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@

## 2.2.1 - 2022-05-27

- chore(ci): depend on shared GHA workflows


## 2.2.0 - 2022-05-23

- dep(node): require 14+
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -252,8 +252,8 @@ exports.redis_unsubscribe = function (next, connection) {
```


[ci-img]: https://github.com/haraka/haraka-results/actions/workflows/ci-test.yml/badge.svg
[ci-url]: https://github.com/haraka/haraka-results/actions/workflows/ci-test.yml
[ci-img]: https://github.com/haraka/haraka-results/actions/workflows/ci.yml/badge.svg
[ci-url]: https://github.com/haraka/haraka-results/actions/workflows/ci.yml
[cov-img]: https://codecov.io/github/haraka/haraka-results/coverage.svg
[cov-url]: https://codecov.io/github/haraka/haraka-results
[clim-img]: https://codeclimate.com/github/haraka/haraka-results/badges/gpa.svg
Expand Down
3 changes: 1 addition & 2 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,7 @@ class ResultStore {

redis_publish (name, obj) {
if (!cfg.main.redis_publish) return;
if (!this.conn.server || !this.conn.server.notes) return;
if (!this.conn.server.notes.redis) return;
if (!this.conn.server?.notes?.redis) return;

const channel = `result-${this.conn.transaction ? this.conn.transaction.uuid : this.conn.uuid}`;
this.conn.server.notes.redis.publish(channel, JSON.stringify({ plugin: name, result: obj }));
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "haraka-results",
"version": "2.2.0",
"version": "2.2.1",
"description": "Haraka results store for connections and transactions",
"main": "index.js",
"directories": {
Expand Down

0 comments on commit 919b84f

Please sign in to comment.