Skip to content

Commit

Permalink
Release v1.0.7 (#30)
Browse files Browse the repository at this point in the history
* import fresh from Haraka
* also import test fixtures
* eslint: add es2020 env
* add GHA codeql workflow
* README: update badge URLs
* restore dissallowed_extns and precompiled REs
* use shared .github test workflow
* test: add start_attachment
  • Loading branch information
msimerson authored Jul 7, 2022
1 parent 8bbbbd3 commit c1ca92d
Show file tree
Hide file tree
Showing 26 changed files with 724 additions and 526 deletions.
1 change: 1 addition & 0 deletions .eslintrc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ env:
node: true
es6: true
mocha: true
es2020: true

plugins:
- haraka
Expand Down
31 changes: 0 additions & 31 deletions .github/workflows/ci-test.yml

This file was deleted.

23 changes: 23 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
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

ubuntu:
needs: [ lint ]
uses: haraka/.github/.github/workflows/ubuntu.yml@master

windows:
needs: [ lint ]
uses: haraka/.github/.github/workflows/windows.yml@master
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
32 changes: 0 additions & 32 deletions .github/workflows/coveralls.yml

This file was deleted.

26 changes: 0 additions & 26 deletions .github/workflows/lint.yml

This file was deleted.

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

on:
release:
types: [ published ]
push:
branches:
- master

env:
node_version: 14
CI: true

jobs:

build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: ${{ env.node_version }}
- run: npm install
- run: npm test

publish-npm:
needs: build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- uses: actions/setup-node@v2
with:
node-version: ${{ env.node_version }}
registry-url: https://registry.npmjs.org
- run: npm install

- run: npm publish --ignore-scripts --access public
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
publish:
uses: haraka/.github/.github/workflows/publish.yml@master
secrets: inherit
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,9 @@ jspm_packages
.node_repl_history

package-lock.json
bower_components
# Optional npm cache directory
.npmrc
.idea
.DS_Store
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
58 changes: 58 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# Logs
logs
*.log
npm-debug.log*

# Runtime data
pids
*.pid
*.seed

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# nyc test coverage
.nyc_output

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# node-waf configuration
.lock-wscript

# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules
jspm_packages

# Optional npm cache directory
.npm

# Optional REPL history
.node_repl_history

package-lock.json
bower_components
# Optional npm cache directory
.npmrc
.idea
.DS_Store
haraka-update.sh

.github
.release
.codeclimate.yml
.editorconfig
.gitignore
.gitmodules
.lgtm.yml
appveyor.yml
codecov.yml
.travis.yml
.eslintrc.yaml
.eslintrc.json
1 change: 1 addition & 0 deletions .release
Submodule .release added at 9be2b2
21 changes: 21 additions & 0 deletions Changes.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,22 @@

### Unreleased


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

#### Added

-

#### Fixed

-

#### Changed

- import fresh from Haraka
- convert tests to mocha


### 1.0.6 - Dec 22, 2021

Expand All @@ -19,3 +37,6 @@
- finished converting tests to mocha, tests work again. Yay.
- es6 updates
- backported changes from haraka/plugins/attachment.js


[1.0.7]: https://github.com/haraka/haraka-plugin-attachment/releases/tag/1.0.7
10 changes: 2 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@ attachment
==========

[![Build Status][ci-img]][ci-url]
[![Windows Build Status][ci-win-img]][ci-win-url]
[![Code Climate][clim-img]][clim-url]
[![NPM][npm-img]][npm-url]
<!-- doesn't work in haraka plugins... yet. [![Code Coverage][cov-img]][cov-url]-->

This plugin allows you to reject messages based on Content-Type within the message or any MIME parts or on the filename of any attachments.

Expand Down Expand Up @@ -82,12 +80,8 @@ Configuration


<!-- leave these buried at the bottom of the document -->
[ci-img]: https://travis-ci.org/haraka/haraka-plugin-attachment.svg
[ci-url]: https://travis-ci.org/haraka/haraka-plugin-attachment
[ci-win-img]: https://ci.appveyor.com/api/projects/status/u33k3jsuymtaqtfq?svg=true
[ci-win-url]: https://ci.appveyor.com/project/msimerson/haraka-plugin-attachment
[cov-img]: https://codecov.io/github/haraka/haraka-plugin-attachment/coverage.svg
[cov-url]: https://codecov.io/github/haraka/haraka-plugin-attachment
[ci-img]: https://github.com/haraka/haraka-plugin-attachment/actions/workflows/ci.yml/badge.svg
[ci-url]: https://github.com/haraka/haraka-plugin-attachment/actions/workflows/ci.yml
[clim-img]: https://codeclimate.com/github/haraka/haraka-plugin-attachment/badges/gpa.svg
[clim-url]: https://codeclimate.com/github/haraka/haraka-plugin-attachment
[npm-img]: https://nodei.co/npm/haraka-plugin-attachment.png
Expand Down
Loading

0 comments on commit c1ca92d

Please sign in to comment.