Skip to content

Commit

Permalink
Merge 56b8969 into 3aa1fea
Browse files Browse the repository at this point in the history
  • Loading branch information
msimerson committed Jun 21, 2023
2 parents 3aa1fea + 56b8969 commit dcb39d9
Show file tree
Hide file tree
Showing 8 changed files with 36 additions and 24 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ jobs:
strategy:
matrix:
os: [ ubuntu-latest, windows-latest, macos-latest ]
node-version: [ 14, 16 ]
node-version: [ 16, 18, 20 ]
fail-fast: false

steps:
- name: Checkout Code
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 1

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Use Node.js 14
uses: actions/setup-node@master
with:
node-version: 14
node-version: 18

- run: |
npm install
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,24 @@ name: Lint

on: [ push, pull_request ]

env:
CI: true

jobs:
lint:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [ 16.x ]
node-version: [ 18 ]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
name: Checkout Code
with:
fetch-depth: 1

- uses: actions/setup-node@v2
- uses: actions/setup-node@v3
name: Use Node.js ${{ matrix.node-version }}
with:
node-version: ${{ matrix.node-version }}
Expand All @@ -27,5 +30,3 @@ jobs:
- name: Lint using eslint
run: npm run lint

env:
CI: true
12 changes: 5 additions & 7 deletions .github/workflows/master.yml → .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ on:
push:
branches:
- master
paths:
- package.json

env:
node_version: 14
node_version: 18

jobs:

Expand All @@ -16,12 +18,12 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Setup node.js ${{ env.node_version }}
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
registry-url: https://registry.npmjs.org/
node-version: ${{ env.node_version }}
Expand All @@ -36,7 +38,3 @@ jobs:
run: npm publish --access public
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

# - name: GitHub Release
# uses: justincy/github-action-npm-release@2.0.1
# id: release
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 = git@github.com:msimerson/.release.git
1 change: 1 addition & 0 deletions .release
Submodule .release added at 0890e9
10 changes: 10 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@

### Unreleased

### 1.2.0 - 2023-06-20

- bump dep versions to latest
- ci: add .release
- deps(contributors): removed, vuln, not maintained


### 1.1.8 - 2022-03-14

- update CI images (goes with 1.1.7)
Expand Down Expand Up @@ -80,3 +89,4 @@
### 1.0.4 - 2015-06-23 @cbanbury

- allow configurable db dir with MAXMIND_DB_DIR
[1.2.0]: https://github.com/msimerson/maxmind-geolite-mirror/releases/tag/1.2.0
15 changes: 7 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "maxmind-geolite-mirror",
"version": "1.1.8",
"version": "1.2.0",
"homepage": "https://github.com/msimerson/maxmind-geolite-mirror",
"description": "Mirror maxmind dbs from geolite.maxmind.com",
"author": {
Expand All @@ -26,7 +26,7 @@
"maxmind-geolite-mirror": "./bin/maxmind-geolite-mirror"
},
"engines": {
"node": ">= v12.0.0"
"node": ">= v14.0.0"
},
"main": "bin/maxmind-geolite-mirror",
"keywords": [
Expand All @@ -43,11 +43,10 @@
"versions": "npx dependency-version-checker check"
},
"devDependencies": {
"contributors": "*",
"eslint": ">=7",
"mocha": "*",
"rewire": "*",
"tmp": "*"
"eslint": "^8.43.0",
"mocha": "^10.2.0",
"rewire": "^6.0.0",
"tmp": "^0.2.1"
},
"license": "MIT",
"files": [
Expand All @@ -56,6 +55,6 @@
"test"
],
"optionalDependencies": {
"tar-stream": "^2.1.0"
"tar-stream": "^3.1.3"
}
}

0 comments on commit dcb39d9

Please sign in to comment.