From f6ebdf74761bfbee3a8bb7b6ccb726b4e45add68 Mon Sep 17 00:00:00 2001 From: Matt Simerson Date: Fri, 15 Dec 2023 10:03:26 -0800 Subject: [PATCH] ci: more shared workflows --- .github/workflows/ci.yml | 28 +++++----------------------- .github/workflows/lint.yml | 26 -------------------------- .github/workflows/publish.yml | 2 +- README.md | 1 + package.json | 4 ++-- 5 files changed, 9 insertions(+), 52 deletions(-) delete mode 100644 .github/workflows/lint.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 74e7a36..a03c787 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,27 +15,9 @@ jobs: secrets: inherit test: - needs: lint - runs-on: ${{ matrix.os }} - # services: - # redis: - # image: redis - # ports: - # - 6379:6379 - strategy: - matrix: - os: [ ubuntu-latest, windows-latest ] - node-version: [ 14, 16, 18 ] - fail-fast: false + needs: [ lint ] + uses: haraka/.github/.github/workflows/ubuntu.yml@master - 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 + windows: + needs: [ lint ] + uses: haraka/.github/.github/workflows/windows.yml@master diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml deleted file mode 100644 index 2207163..0000000 --- a/.github/workflows/lint.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: Lint - -on: [ push ] - -jobs: - - lint: - - runs-on: ubuntu-latest - - strategy: - matrix: - node-version: - - 14 - - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 - name: Node.js ${{ matrix.node-version }} - with: - node-version: ${{ matrix.node-version }} - - - run: npm install - - run: npm run lint - env: - CI: true diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d489fbd..e81c15f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -13,4 +13,4 @@ env: jobs: publish: uses: haraka/.github/.github/workflows/publish.yml@master - secrets: inherit \ No newline at end of file + secrets: inherit diff --git a/README.md b/README.md index 2ea4199..d1b6231 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,7 @@ connection.transaction.notes.get(['i.do','like','pa.in']); To reduce the likelihood of namespace collisions in Haraka notes, consider registering the note paths your plugins use [in the registry](https://github.com/haraka/haraka-notes/wiki). + [ci-img]: https://github.com/haraka/haraka-notes/actions/workflows/ci.yml/badge.svg [ci-url]: https://github.com/haraka/haraka-notes/actions/workflows/ci.yml diff --git a/package.json b/package.json index aa8f3b1..6f1e480 100644 --- a/package.json +++ b/package.json @@ -23,8 +23,8 @@ }, "homepage": "https://github.com/haraka/haraka-notes#readme", "devDependencies": { - "eslint": ">=8", + "eslint": "^8.55.0", "eslint-plugin-haraka": "*", - "mocha": ">=9" + "mocha": "^10.2.0" } }