Skip to content

Commit

Permalink
Merge pull request #13 from haraka/release-1.1.3
Browse files Browse the repository at this point in the history
Release v1.1.3
  • Loading branch information
msimerson authored Aug 23, 2024
2 parents 1aecf4b + 5033613 commit 958e120
Show file tree
Hide file tree
Showing 24 changed files with 1,354 additions and 1,056 deletions.
24 changes: 3 additions & 21 deletions .eslintrc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,10 @@ env:
node: true
es6: true
mocha: true
es2020: true
es2022: true

plugins:
- haraka

extends:
- eslint:recommended
- plugin:haraka/recommended

root: true
extends: '@haraka'

rules:
no-var: warn
space-before-function-paren: warn
no-shadow: warn
dot-notation: warn
indent: warn

globals:
OK: true
CONT: true
DENY: true
DENYSOFT: true
DENYDISCONNECT: true
DENYSOFTDISCONNECT: true
no-unused-vars: 0
39 changes: 19 additions & 20 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,32 +1,31 @@
name: CI

on: [ push, pull_request ]
on: [push, pull_request]

env:
CI: true

jobs:

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

test:
needs: [ lint, get-lts ]
needs: [lint, get-lts]
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ ubuntu-latest ]
os: [ubuntu-latest]
node-version: ${{ fromJson(needs.get-lts.outputs.lts) }}
fail-fast: false
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
name: Node ${{ matrix.node-version }} on ${{ matrix.os }}
with:
node-version: ${{ matrix.node-version }}
- run: npm install
- run: sudo ./test/fixtures/linux/setup.sh
- run: npm test
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
name: Node ${{ matrix.node-version }} on ${{ matrix.os }}
with:
node-version: ${{ matrix.node-version }}
- run: npm install
- run: sudo ./test/fixtures/linux/setup.sh
- run: npm test

# test-win:
# needs: [ lint, get-lts ]
Expand All @@ -46,11 +45,11 @@ jobs:
# - 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 }}
min: ${{ steps.get.outputs.min }}
runs-on: ubuntu-latest
steps:
- id: get
uses: msimerson/node-lts-versions@v1
outputs:
active: ${{ steps.get.outputs.active }}
lts: ${{ steps.get.outputs.lts }}
min: ${{ steps.get.outputs.min }}
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ name: CodeQL

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

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- run: npm test

publish-npm:
needs: [ build ]
needs: [build]
runs-on: ubuntu-latest
environment: npm
steps:
Expand All @@ -40,7 +40,7 @@ jobs:
NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}

publish-gpr:
needs: [ build ]
needs: [build]
runs-on: ubuntu-latest
environment: ghpm
permissions:
Expand All @@ -53,9 +53,9 @@ jobs:
- uses: actions/setup-node@v4
with:
registry-url: https://npm.pkg.github.com/
scope: "@haraka"
scope: '@haraka'
- name: rename package with @haraka scope
run: node .release/npm/prepend-scope.cjs @haraka
- run: npm publish
env:
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,3 @@ bower_components
.npmrc
.idea
.DS_Store
haraka-update.sh
61 changes: 0 additions & 61 deletions .npmignore

This file was deleted.

1 change: 1 addition & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
singleQuote: true
2 changes: 1 addition & 1 deletion .release
13 changes: 10 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
### Unreleased

### [1.1.3] - 2024-08-23

- fix: always unbind after bind, fixes #12
- dep: eslint-plugin-haraka -> @haraka/eslint-config
- chore: populate [files] in package.json. Delete .npmignore.
- lint: remove duplicate / stale rules from .eslintrc
- chore: prettier automated code formatting
- doc: add CONTRIBUTORS.md

### [1.1.2] - 2024-03-15

Expand Down Expand Up @@ -29,18 +37,17 @@
- test: add fixtures for setting up slapd on macosx and linux
- doc(README): update with GHA badge


#### 1.0.2 - 2017-09-30

- check_rcpt must return next(ok) if a valid recipient was found


#### 1.0.2 - 2016-12-10

- test get_alias for resolve-by-dn case
- added debug log to _resolve_dn_to_alias
- added debug log to \_resolve_dn_to_alias
- fixed wrong default attribute there
- include all ops in config

[1.1.1]: https://github.com/haraka/haraka-plugin-ldap/releases/tag/1.1.1
[1.1.2]: https://github.com/haraka/haraka-plugin-ldap/releases/tag/1.1.2
[1.1.3]: https://github.com/haraka/haraka-plugin-ldap/releases/tag/1.1.3
8 changes: 8 additions & 0 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Contributors

This handcrafted artisinal software is brought to you by:

| <img height="80" src="https://avatars.githubusercontent.com/u/261635?v=4"><br><a href="https://github.com/msimerson">msimerson</a> (<a href="https://github.com/haraka/haraka-plugin-ldap/commits?author=msimerson">30</a>)|
| :---: |

<sub>this file is maintained by [.release](https://github.com/msimerson/.release)</sub>
Loading

0 comments on commit 958e120

Please sign in to comment.