diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 95e67570..a7c21237 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -224,9 +224,6 @@ build:macos: - export PATH="$(npm root)/.bin:$PATH" - npm run prebuild --verbose - npm test -- --ci --coverage - # Temporary fix for m1 mac runners: https://github.com/MatrixAI/js-db/pull/64#issuecomment-1607109864 - # Remove when upstream has fixed and you have updated `systeminformation` package - - patch ./benches/index.ts < ./scripts/systeminformation-cpu.patch - npm run bench artifacts: when: always diff --git a/package-lock.json b/package-lock.json index 5077edcb..5a4816b0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42,7 +42,7 @@ "prettier": "^2.6.2", "semver": "^7.3.7", "shx": "^0.3.4", - "systeminformation": "^5.18.4", + "systeminformation": "^5.18.5", "ts-jest": "^28.0.5", "ts-node": "^10.9.1", "tsconfig-paths": "^3.9.0", @@ -6460,9 +6460,9 @@ } }, "node_modules/systeminformation": { - "version": "5.18.4", - "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.18.4.tgz", - "integrity": "sha512-x1MHqHooJ2n9fmQRngH5TdSk/BcPAPLBBBmS7BSTkALRT56RlgiiNPP7HKoNu2SIFXSG4nPfi1gWh8ASmHPCrA==", + "version": "5.18.5", + "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.18.5.tgz", + "integrity": "sha512-es2jgMdpjNv9B/sQc0afGlnS2ip7/Nzlo9hAgkaq22NZftQuqHTnf/CuBadzOwl/DZB2aCTLDtzw83nAnT2owg==", "dev": true, "os": [ "darwin", @@ -11728,9 +11728,9 @@ "dev": true }, "systeminformation": { - "version": "5.18.4", - "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.18.4.tgz", - "integrity": "sha512-x1MHqHooJ2n9fmQRngH5TdSk/BcPAPLBBBmS7BSTkALRT56RlgiiNPP7HKoNu2SIFXSG4nPfi1gWh8ASmHPCrA==", + "version": "5.18.5", + "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.18.5.tgz", + "integrity": "sha512-es2jgMdpjNv9B/sQc0afGlnS2ip7/Nzlo9hAgkaq22NZftQuqHTnf/CuBadzOwl/DZB2aCTLDtzw83nAnT2owg==", "dev": true }, "tar": { diff --git a/package.json b/package.json index de5f976e..1ca6539c 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "prettier": "^2.6.2", "semver": "^7.3.7", "shx": "^0.3.4", - "systeminformation": "^5.18.4", + "systeminformation": "^5.18.5", "ts-jest": "^28.0.5", "ts-node": "^10.9.1", "tsconfig-paths": "^3.9.0", diff --git a/scripts/systeminformation-cpu.patch b/scripts/systeminformation-cpu.patch deleted file mode 100644 index d69396dd..00000000 --- a/scripts/systeminformation-cpu.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/benches/index.ts b/benches/index.ts -index 5c96be7..ff58cec 100644 ---- a/benches/index.ts -+++ b/benches/index.ts -@@ -32,7 +32,6 @@ async function main(): Promise { - } - await metricsFile.close(); - const systemData = await si.get({ -- cpu: '*', - osInfo: 'platform, distro, release, kernel, arch', - system: 'model, manufacturer', - });