From 5f29974b1cc0f7f3742111f7e6e8926fc29e6a20 Mon Sep 17 00:00:00 2001 From: rafaykh90 Date: Tue, 7 May 2024 13:52:23 +0300 Subject: [PATCH 01/15] Fix CI --- package-lock.json | 124 ++++++++++++++++++++++++---------------------- 1 file changed, 64 insertions(+), 60 deletions(-) diff --git a/package-lock.json b/package-lock.json index f1d5fc00c..642c86c18 100644 --- a/package-lock.json +++ b/package-lock.json @@ -198,10 +198,11 @@ } }, "node_modules/aws-sdk": { - "version": "2.1227.0", - "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1227.0.tgz", - "integrity": "sha512-L6vnopVXVXKEqi0R4i54F6xSemczd/aRy4UscqnfpyvNYr9yLL3jVApFo7OX8hxompe/tgxdQFXvMiNzhkSrwQ==", + "version": "2.1614.0", + "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1614.0.tgz", + "integrity": "sha512-dsfoOk/1UBGfELJ9skBma1RzfYXalK+0QdStuwKCqrYHgpF/mlf7BqYOB0acNQHzxgVxEP0LOGjWZOzWWwdGhw==", "dev": true, + "hasInstallScript": true, "dependencies": { "buffer": "4.9.2", "events": "1.1.1", @@ -212,7 +213,7 @@ "url": "0.10.3", "util": "^0.12.4", "uuid": "8.0.0", - "xml2js": "0.4.19" + "xml2js": "0.6.2" }, "engines": { "node": ">= 10.0.0" @@ -977,9 +978,9 @@ } }, "node_modules/ip": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz", - "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.1.tgz", + "integrity": "sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==", "dev": true }, "node_modules/is-arguments": { @@ -1274,9 +1275,9 @@ } }, "node_modules/minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -1808,15 +1809,15 @@ "optional": true }, "node_modules/sax": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz", + "integrity": "sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==", "dev": true }, "node_modules/semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", + "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", "dependencies": { "lru-cache": "^6.0.0" }, @@ -2031,14 +2032,14 @@ } }, "node_modules/tar": { - "version": "6.1.13", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.13.tgz", - "integrity": "sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", + "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", "dev": true, "dependencies": { "chownr": "^2.0.0", "fs-minipass": "^2.0.0", - "minipass": "^4.0.0", + "minipass": "^5.0.0", "minizlib": "^2.1.1", "mkdirp": "^1.0.3", "yallist": "^4.0.0" @@ -2083,9 +2084,9 @@ } }, "node_modules/tar/node_modules/minipass": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.5.tgz", - "integrity": "sha512-+yQl7SX3bIT83Lhb4BVorMAHVuqsskxRdlmO9kTpyukp8vsm2Sn/fUOV9xlnG8/a5JsypJzap21lz/y3FBMJ8Q==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", "dev": true, "engines": { "node": ">=8" @@ -2263,19 +2264,22 @@ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, "node_modules/xml2js": { - "version": "0.4.19", - "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz", - "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==", + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.6.2.tgz", + "integrity": "sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA==", "dev": true, "dependencies": { "sax": ">=0.6.0", - "xmlbuilder": "~9.0.1" + "xmlbuilder": "~11.0.0" + }, + "engines": { + "node": ">=4.0.0" } }, "node_modules/xmlbuilder": { - "version": "9.0.7", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", - "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=", + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz", + "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==", "dev": true, "engines": { "node": ">=4.0" @@ -2412,9 +2416,9 @@ "dev": true }, "aws-sdk": { - "version": "2.1227.0", - "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1227.0.tgz", - "integrity": "sha512-L6vnopVXVXKEqi0R4i54F6xSemczd/aRy4UscqnfpyvNYr9yLL3jVApFo7OX8hxompe/tgxdQFXvMiNzhkSrwQ==", + "version": "2.1614.0", + "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1614.0.tgz", + "integrity": "sha512-dsfoOk/1UBGfELJ9skBma1RzfYXalK+0QdStuwKCqrYHgpF/mlf7BqYOB0acNQHzxgVxEP0LOGjWZOzWWwdGhw==", "dev": true, "requires": { "buffer": "4.9.2", @@ -2426,7 +2430,7 @@ "url": "0.10.3", "util": "^0.12.4", "uuid": "8.0.0", - "xml2js": "0.4.19" + "xml2js": "0.6.2" }, "dependencies": { "sax": { @@ -3024,9 +3028,9 @@ } }, "ip": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz", - "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.1.tgz", + "integrity": "sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==", "dev": true }, "is-arguments": { @@ -3233,9 +3237,9 @@ } }, "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "requires": { "brace-expansion": "^1.1.7" } @@ -3648,15 +3652,15 @@ "optional": true }, "sax": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz", + "integrity": "sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==", "dev": true }, "semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", + "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", "requires": { "lru-cache": "^6.0.0" } @@ -3826,14 +3830,14 @@ } }, "tar": { - "version": "6.1.13", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.13.tgz", - "integrity": "sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", + "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", "dev": true, "requires": { "chownr": "^2.0.0", "fs-minipass": "^2.0.0", - "minipass": "^4.0.0", + "minipass": "^5.0.0", "minizlib": "^2.1.1", "mkdirp": "^1.0.3", "yallist": "^4.0.0" @@ -3846,9 +3850,9 @@ "dev": true }, "minipass": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.5.tgz", - "integrity": "sha512-+yQl7SX3bIT83Lhb4BVorMAHVuqsskxRdlmO9kTpyukp8vsm2Sn/fUOV9xlnG8/a5JsypJzap21lz/y3FBMJ8Q==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", "dev": true }, "mkdirp": { @@ -4015,19 +4019,19 @@ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, "xml2js": { - "version": "0.4.19", - "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz", - "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==", + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.6.2.tgz", + "integrity": "sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA==", "dev": true, "requires": { "sax": ">=0.6.0", - "xmlbuilder": "~9.0.1" + "xmlbuilder": "~11.0.0" } }, "xmlbuilder": { - "version": "9.0.7", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", - "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=", + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz", + "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==", "dev": true }, "yallist": { From d065cbb34b870d8e627afdba12520a28c1f4569a Mon Sep 17 00:00:00 2001 From: rafaykh90 Date: Tue, 7 May 2024 14:01:20 +0300 Subject: [PATCH 02/15] upgrade macos version --- .github/workflows/builds.yml | 4 ++-- binding.gyp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 324c91f27..430f32a37 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -16,7 +16,7 @@ jobs: os: - name: darwin architecture: x86-64 - host: macos-10.15 + host: macos-11 - name: linux architecture: x86-64 @@ -92,7 +92,7 @@ jobs: os: - name: darwin architecture: x86-64 - host: macos-10.15 + host: macos-11 - name: linux architecture: x86-64 diff --git a/binding.gyp b/binding.gyp index 96d652bf7..c8ed31a09 100644 --- a/binding.gyp +++ b/binding.gyp @@ -102,7 +102,7 @@ ], 'GCC_ENABLE_CPP_RTTI': 'YES', 'GCC_ENABLE_CPP_EXCEPTIONS': 'YES', - 'MACOSX_DEPLOYMENT_TARGET':'10.8', + 'MACOSX_DEPLOYMENT_TARGET':'11', 'CLANG_CXX_LIBRARY': 'libc++', 'CLANG_CXX_LANGUAGE_STANDARD':'c++14', 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0' From 55ac042c3c0cf0b6fdb82477baa1c644c1fc4837 Mon Sep 17 00:00:00 2001 From: rafaykh90 Date: Tue, 7 May 2024 14:06:14 +0300 Subject: [PATCH 03/15] add python step --- .github/workflows/builds.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 430f32a37..f181eee70 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -29,6 +29,11 @@ jobs: with: node-version: ${{ matrix.node }} + - name: Install dependencies + run: | + python -m pip install --upgrade pip + python -m pip install distutils + - name: Test run: | npm ci @@ -104,6 +109,11 @@ jobs: with: node-version: "16" + - name: Install dependencies + run: | + python -m pip install --upgrade pip + python -m pip install distutils + - name: Build run: | ./scripts/setup.sh --config local.env From 86beecdc97a93dd83ea25ad8de9e23c904c68ecc Mon Sep 17 00:00:00 2001 From: rafaykh90 Date: Tue, 7 May 2024 14:08:57 +0300 Subject: [PATCH 04/15] fix python --- .github/workflows/builds.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index f181eee70..030e01fe9 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -29,10 +29,9 @@ jobs: with: node-version: ${{ matrix.node }} - - name: Install dependencies - run: | - python -m pip install --upgrade pip - python -m pip install distutils + - uses: actions/setup-python@v5 + with: + python-version: "3.x" - name: Test run: | @@ -109,10 +108,9 @@ jobs: with: node-version: "16" - - name: Install dependencies - run: | - python -m pip install --upgrade pip - python -m pip install distutils + - uses: actions/setup-python@v5 + with: + python-version: "3.x" - name: Build run: | From 5d99ed35af635f5e32bd4b7bde58d830b0b78c98 Mon Sep 17 00:00:00 2001 From: rafaykh90 Date: Tue, 7 May 2024 14:11:06 +0300 Subject: [PATCH 05/15] use python 3.10 --- .github/workflows/builds.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 030e01fe9..0ddbbd8a3 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -31,7 +31,7 @@ jobs: - uses: actions/setup-python@v5 with: - python-version: "3.x" + python-version: "3.10" - name: Test run: | @@ -110,7 +110,7 @@ jobs: - uses: actions/setup-python@v5 with: - python-version: "3.x" + python-version: "3.10" - name: Build run: | From 36074ca24fc2b563f4c1f775ef206c6f7aa58cc1 Mon Sep 17 00:00:00 2001 From: rafaykh90 Date: Tue, 7 May 2024 14:15:16 +0300 Subject: [PATCH 06/15] install setuptools --- .github/workflows/builds.yml | 16 ++++++++++------ binding.gyp | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 0ddbbd8a3..2f409f496 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -29,9 +29,11 @@ jobs: with: node-version: ${{ matrix.node }} - - uses: actions/setup-python@v5 - with: - python-version: "3.10" + # Python 3.12+ needs distutils to be installed + - name: Install dependencies + run: | + python -m pip install --upgrade pip + python -m pip install setuptools - name: Test run: | @@ -108,9 +110,11 @@ jobs: with: node-version: "16" - - uses: actions/setup-python@v5 - with: - python-version: "3.10" + # Python 3.12+ needs distutils to be installed + - name: Install dependencies + run: | + python -m pip install --upgrade pip + python -m pip install setuptools - name: Build run: | diff --git a/binding.gyp b/binding.gyp index c8ed31a09..96d652bf7 100644 --- a/binding.gyp +++ b/binding.gyp @@ -102,7 +102,7 @@ ], 'GCC_ENABLE_CPP_RTTI': 'YES', 'GCC_ENABLE_CPP_EXCEPTIONS': 'YES', - 'MACOSX_DEPLOYMENT_TARGET':'11', + 'MACOSX_DEPLOYMENT_TARGET':'10.8', 'CLANG_CXX_LIBRARY': 'libc++', 'CLANG_CXX_LANGUAGE_STANDARD':'c++14', 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0' From 1d589e28b67f853679f97039af13d6242b873c47 Mon Sep 17 00:00:00 2001 From: rafaykh90 Date: Tue, 7 May 2024 14:20:35 +0300 Subject: [PATCH 07/15] fix --- .github/workflows/builds.yml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 2f409f496..0ddbbd8a3 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -29,11 +29,9 @@ jobs: with: node-version: ${{ matrix.node }} - # Python 3.12+ needs distutils to be installed - - name: Install dependencies - run: | - python -m pip install --upgrade pip - python -m pip install setuptools + - uses: actions/setup-python@v5 + with: + python-version: "3.10" - name: Test run: | @@ -110,11 +108,9 @@ jobs: with: node-version: "16" - # Python 3.12+ needs distutils to be installed - - name: Install dependencies - run: | - python -m pip install --upgrade pip - python -m pip install setuptools + - uses: actions/setup-python@v5 + with: + python-version: "3.10" - name: Build run: | From 1c3f38120e1b67d7c8220cfb8de0e557f392d2ed Mon Sep 17 00:00:00 2001 From: rafaykh90 Date: Tue, 7 May 2024 14:24:50 +0300 Subject: [PATCH 08/15] test only node 16 --- .github/workflows/builds.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 0ddbbd8a3..c805441b1 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -11,7 +11,7 @@ jobs: runs-on: ${{ matrix.os.host }} strategy: matrix: - node: [14, 16, 18] + node: [16] build_type: ["debug", "release"] os: - name: darwin From 2457a107c968c532897d001b71908856b07df08f Mon Sep 17 00:00:00 2001 From: rafaykh90 Date: Tue, 7 May 2024 14:29:36 +0300 Subject: [PATCH 09/15] node-addon-api- v6 --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 642c86c18..dcfdd9dc0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "d3-queue": "^3.0.7", "glob": "^7.1.6", "minimist": "^1.2.5", - "node-addon-api": "^2.0.1", + "node-addon-api": "^6.1.0", "node-gyp-build": "^4.6.0", "prebuildify": "^5.0.1" }, @@ -1424,9 +1424,9 @@ } }, "node_modules/node-addon-api": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.1.tgz", - "integrity": "sha512-2WVfwRfIr1AVn3dRq4yRc2Hn35ND+mPJH6inC6bjpYCZVrpXPB4j3T6i//OGVfqVsR1t/X/axRulDsheq4F0LQ==" + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz", + "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==" }, "node_modules/node-gyp": { "version": "9.3.1", @@ -3351,9 +3351,9 @@ } }, "node-addon-api": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.1.tgz", - "integrity": "sha512-2WVfwRfIr1AVn3dRq4yRc2Hn35ND+mPJH6inC6bjpYCZVrpXPB4j3T6i//OGVfqVsR1t/X/axRulDsheq4F0LQ==" + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz", + "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==" }, "node-gyp": { "version": "9.3.1", diff --git a/package.json b/package.json index af7a31368..b4cd11a1a 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "d3-queue": "^3.0.7", "glob": "^7.1.6", "minimist": "^1.2.5", - "node-addon-api": "^2.0.1", + "node-addon-api": "^6.1.0", "node-gyp-build": "^4.6.0", "prebuildify": "^5.0.1" }, From 21151121e66031dbae984a12545fa4b1fb6f72e1 Mon Sep 17 00:00:00 2001 From: rafaykh90 Date: Tue, 7 May 2024 18:42:55 +0300 Subject: [PATCH 10/15] Revert "node-addon-api- v6" This reverts commit 2457a107c968c532897d001b71908856b07df08f. --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index dcfdd9dc0..642c86c18 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "d3-queue": "^3.0.7", "glob": "^7.1.6", "minimist": "^1.2.5", - "node-addon-api": "^6.1.0", + "node-addon-api": "^2.0.1", "node-gyp-build": "^4.6.0", "prebuildify": "^5.0.1" }, @@ -1424,9 +1424,9 @@ } }, "node_modules/node-addon-api": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz", - "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==" + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.1.tgz", + "integrity": "sha512-2WVfwRfIr1AVn3dRq4yRc2Hn35ND+mPJH6inC6bjpYCZVrpXPB4j3T6i//OGVfqVsR1t/X/axRulDsheq4F0LQ==" }, "node_modules/node-gyp": { "version": "9.3.1", @@ -3351,9 +3351,9 @@ } }, "node-addon-api": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz", - "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==" + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.1.tgz", + "integrity": "sha512-2WVfwRfIr1AVn3dRq4yRc2Hn35ND+mPJH6inC6bjpYCZVrpXPB4j3T6i//OGVfqVsR1t/X/axRulDsheq4F0LQ==" }, "node-gyp": { "version": "9.3.1", diff --git a/package.json b/package.json index b4cd11a1a..af7a31368 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "d3-queue": "^3.0.7", "glob": "^7.1.6", "minimist": "^1.2.5", - "node-addon-api": "^6.1.0", + "node-addon-api": "^2.0.1", "node-gyp-build": "^4.6.0", "prebuildify": "^5.0.1" }, From 6df2302053fb28c3ba7b8132c9d25c946140dc4b Mon Sep 17 00:00:00 2001 From: rafaykh90 Date: Tue, 7 May 2024 18:43:48 +0300 Subject: [PATCH 11/15] use macos14 --- .github/workflows/builds.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index c805441b1..ab78b9444 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -16,7 +16,7 @@ jobs: os: - name: darwin architecture: x86-64 - host: macos-11 + host: macos-14 - name: linux architecture: x86-64 @@ -96,7 +96,7 @@ jobs: os: - name: darwin architecture: x86-64 - host: macos-11 + host: macos-14 - name: linux architecture: x86-64 From 957086ad5d15a6b821dced33747854e5c88a2986 Mon Sep 17 00:00:00 2001 From: rafaykh90 Date: Tue, 7 May 2024 18:49:56 +0300 Subject: [PATCH 12/15] use macos latest --- .github/workflows/builds.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index ab78b9444..b63da1b78 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -16,7 +16,7 @@ jobs: os: - name: darwin architecture: x86-64 - host: macos-14 + host: macos-latest - name: linux architecture: x86-64 @@ -96,7 +96,7 @@ jobs: os: - name: darwin architecture: x86-64 - host: macos-14 + host: macos-latest - name: linux architecture: x86-64 From c7bc25891e8610242fb56028732b19252e6b10ed Mon Sep 17 00:00:00 2001 From: rafaykh90 Date: Tue, 7 May 2024 18:51:26 +0300 Subject: [PATCH 13/15] use macos13 --- .github/workflows/builds.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index b63da1b78..a889c31fd 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -16,7 +16,7 @@ jobs: os: - name: darwin architecture: x86-64 - host: macos-latest + host: macos-13 - name: linux architecture: x86-64 @@ -96,7 +96,7 @@ jobs: os: - name: darwin architecture: x86-64 - host: macos-latest + host: macos-13 - name: linux architecture: x86-64 From 2f5d165754f31b110163a389fda1f69cce66dbdb Mon Sep 17 00:00:00 2001 From: rafaykh90 Date: Tue, 7 May 2024 18:55:14 +0300 Subject: [PATCH 14/15] test --- .github/workflows/builds.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index a889c31fd..0c17e9c1a 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -16,7 +16,7 @@ jobs: os: - name: darwin architecture: x86-64 - host: macos-13 + host: macos-14-large - name: linux architecture: x86-64 @@ -96,7 +96,7 @@ jobs: os: - name: darwin architecture: x86-64 - host: macos-13 + host: macos-14-large - name: linux architecture: x86-64 From cdb4c0b705691e17033758859921ece325f067cf Mon Sep 17 00:00:00 2001 From: rafaykh90 Date: Wed, 8 May 2024 15:31:59 +0300 Subject: [PATCH 15/15] try set env variables --- .github/workflows/builds.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 0c17e9c1a..5b88386c6 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -16,13 +16,17 @@ jobs: os: - name: darwin architecture: x86-64 - host: macos-14-large + host: macos-11 + env: + CC: "clang" + CXX: "clang++" - name: linux architecture: x86-64 host: ubuntu-20.04 name: ${{ matrix.os.name }}-${{ matrix.os.architecture }}-node${{ matrix.node }}-${{ matrix.build_type }} test + if: ${{ ! startsWith(github.ref, 'refs/tags/') }} steps: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 @@ -96,7 +100,10 @@ jobs: os: - name: darwin architecture: x86-64 - host: macos-14-large + host: macos-11 + env: + CC: "clang" + CXX: "clang++" - name: linux architecture: x86-64