From 691baa4373be802be272d16233b583840c4b68f4 Mon Sep 17 00:00:00 2001 From: Dmitry Shirokov Date: Wed, 7 May 2025 20:05:55 +1000 Subject: [PATCH 1/9] feat: Trigger release --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index c79b35e..b606b7f 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright 2022 Dmitry Shirokov +Copyright 2025 Dmitry Shirokov Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: From 3b16d9b044bf978bb330139d470a1142bbdba327 Mon Sep 17 00:00:00 2001 From: Dmitry Shirokov Date: Wed, 7 May 2025 20:26:56 +1000 Subject: [PATCH 2/9] fix fetch usage --- scripts/postinstall.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/postinstall.js b/scripts/postinstall.js index 435f796..4db2c9c 100644 --- a/scripts/postinstall.js +++ b/scripts/postinstall.js @@ -2,7 +2,8 @@ const fs = require('fs'); const zlib = require('zlib'); const tar = require('tar'); const path = require('path'); -const fetch = require('node-fetch'); +const fetch = require('node-fetch').default; + const { getAccountId, getLicense, getSelectedDbs } = require('../utils'); let licenseKey; From 2b4ee7b2662fefc1bddd42af839b0ce1bf33905e Mon Sep 17 00:00:00 2001 From: Dmitry Shirokov Date: Wed, 7 May 2025 20:32:26 +1000 Subject: [PATCH 3/9] Development snapshot --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4aa4a1f..1ab9326 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ }, "homepage": "https://github.com/runk/node-geolite2#readme", "dependencies": { - "node-fetch": "^3.0.0", + "node-fetch": "^2.7.0", "tar": "^7.0.0" }, "devDependencies": { From 9db9cc2aa04a1fa7448fe5d6e71a72c55ecac7cd Mon Sep 17 00:00:00 2001 From: Dmitry Shirokov Date: Wed, 7 May 2025 20:33:15 +1000 Subject: [PATCH 4/9] Development snapshot --- scripts/postinstall.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/postinstall.js b/scripts/postinstall.js index 4db2c9c..0237d0d 100644 --- a/scripts/postinstall.js +++ b/scripts/postinstall.js @@ -2,7 +2,7 @@ const fs = require('fs'); const zlib = require('zlib'); const tar = require('tar'); const path = require('path'); -const fetch = require('node-fetch').default; +const fetch = require('node-fetch'); const { getAccountId, getLicense, getSelectedDbs } = require('../utils'); From e4a5ac844880c227d6d4abf004ec1eee51fc2366 Mon Sep 17 00:00:00 2001 From: Dmitry Shirokov Date: Wed, 7 May 2025 22:07:02 +1000 Subject: [PATCH 5/9] debugging --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 03f7e42..6edbdd5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,6 +21,7 @@ jobs: uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} + - run: cat package.json - run: npm i env: MAXMIND_LICENSE_KEY: ${{ secrets.MAXMIND_LICENSE_KEY }} From 9cb20c03c380391bbef9bf1668f9ee67dc3886f5 Mon Sep 17 00:00:00 2001 From: Dmitry Shirokov Date: Wed, 7 May 2025 22:08:35 +1000 Subject: [PATCH 6/9] debugging --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6edbdd5..27b0fbf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,8 +22,8 @@ jobs: with: node-version: ${{ matrix.node-version }} - run: cat package.json - - run: npm i - env: - MAXMIND_LICENSE_KEY: ${{ secrets.MAXMIND_LICENSE_KEY }} - - run: npm run format:check - - run: npm test + # - run: npm i + # env: + # MAXMIND_LICENSE_KEY: ${{ secrets.MAXMIND_LICENSE_KEY }} + # - run: npm run format:check + # - run: npm test From 7fbce7152fae2919fd158eea36c13e8a1667afbf Mon Sep 17 00:00:00 2001 From: Dmitry Shirokov Date: Wed, 7 May 2025 22:10:01 +1000 Subject: [PATCH 7/9] revert build config --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 27b0fbf..ab567d5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,9 +3,9 @@ name: Build on: push: branches: [master] - pull_request_target: + pull_request: branches: ['*'] - types: [opened, synchronize] + # types: [opened, synchronize] jobs: build: From bc5f9d926fc5e51b6b44791a7cd46268e42ce0d2 Mon Sep 17 00:00:00 2001 From: Dmitry Shirokov Date: Wed, 7 May 2025 22:11:36 +1000 Subject: [PATCH 8/9] uncomment ci steps --- .github/workflows/build.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ab567d5..25782ad 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,9 +21,8 @@ jobs: uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} - - run: cat package.json - # - run: npm i - # env: - # MAXMIND_LICENSE_KEY: ${{ secrets.MAXMIND_LICENSE_KEY }} - # - run: npm run format:check - # - run: npm test + - run: npm i + env: + MAXMIND_LICENSE_KEY: ${{ secrets.MAXMIND_LICENSE_KEY }} + - run: npm run format:check + - run: npm test From 351501a65aa56c99f16f97e34ef2693a869fa923 Mon Sep 17 00:00:00 2001 From: Dmitry Shirokov Date: Wed, 7 May 2025 22:14:29 +1000 Subject: [PATCH 9/9] remove node 16 from the build matrix --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 25782ad..217a177 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: - node-version: [16.x, 18.x, 20.x, 22.x] + node-version: [18.x, 20.x, 22.x] steps: - uses: actions/checkout@v4