Skip to content

Commit 3d3345b

Browse files
prabhuprabhu
committed
Update sqlite3 and cdxgen plugins to add linux musl support
Signed-off-by: Prabhu Subramanian <[email protected]>
1 parent 670520a commit 3d3345b

File tree

7 files changed

+96
-72
lines changed

7 files changed

+96
-72
lines changed

‎.github/workflows/nodejs.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,15 @@ jobs:
8181
deno compile --allow-read --allow-env --allow-run --allow-sys=uid,systemMemoryInfo,gid,osRelease,homedir --allow-write --allow-net --include=./data --include=./package.json --output cdxgenx.exe bin/cdxgen.js
8282
.\cdxgenx.exe --help
8383
(Get-FileHash .\cdxgenx.exe).hash | Out-File -FilePath .\cdxgenx.exe.sha256
84-
deno compile --allow-read --allow-env --allow-run --allow-sys=uid,systemMemoryInfo,gid,osRelease,homedir --allow-write --allow-net --node-modules-dir=auto --allow-ffi --allow-scripts=npm:@appthreat/[email protected].3 --include=./data --include=./package.json --include=node_modules/sqlite3/build/Release --output evinse.exe bin/evinse.js
84+
deno compile --allow-read --allow-env --allow-run --allow-sys=uid,systemMemoryInfo,gid,osRelease,homedir --allow-write --allow-net --node-modules-dir=auto --allow-ffi --allow-scripts=npm:@appthreat/[email protected].4 --include=./data --include=./package.json --include=node_modules/sqlite3/build/Release --output evinse.exe bin/evinse.js
8585
.\evinse.exe --help
8686
(Get-FileHash .\evinse.exe).hash | Out-File -FilePath .\evinse.exe.sha256
8787
artifact: cdxgenx.exe
8888
- os: macos
8989
build: |
9090
deno compile --allow-read --allow-env --allow-run --allow-sys=uid,systemMemoryInfo,gid,homedir --allow-write --allow-net --include=./data --include=./package.json --target aarch64-apple-darwin --output cdxgenx-darwin-arm64 bin/cdxgen.js
9191
shasum -a 256 cdxgenx-darwin-arm64 > cdxgenx-darwin-arm64.sha256
92-
deno compile --allow-read --allow-env --allow-run --allow-sys=uid,systemMemoryInfo,gid,homedir --allow-write --allow-net --node-modules-dir=auto --allow-ffi --allow-scripts=npm:@appthreat/[email protected].3 --include=./data --include=./package.json --include=node_modules/sqlite3/build/Release --target aarch64-apple-darwin --output evinse-darwin-arm64 bin/evinse.js
92+
deno compile --allow-read --allow-env --allow-run --allow-sys=uid,systemMemoryInfo,gid,homedir --allow-write --allow-net --node-modules-dir=auto --allow-ffi --allow-scripts=npm:@appthreat/[email protected].4 --include=./data --include=./package.json --include=node_modules/sqlite3/build/Release --target aarch64-apple-darwin --output evinse-darwin-arm64 bin/evinse.js
9393
shasum -a 256 evinse-darwin-arm64 > evinse-darwin-arm64.sha256
9494
./evinse-darwin-arm64 --help
9595
artifact: cdxgenx-darwin-arm64
@@ -99,7 +99,7 @@ jobs:
9999
shasum -a 256 cdxgenx > cdxgenx.sha256
100100
chmod + cdxgenx
101101
./cdxgenx --help
102-
deno compile --allow-read --allow-env --allow-run --allow-sys=uid,systemMemoryInfo,gid,homedir --allow-write --allow-net --node-modules-dir=auto --allow-ffi --allow-scripts=npm:@appthreat/[email protected].3 --include=./data --include=./package.json --include=node_modules/sqlite3/build/Release --output evinse bin/evinse.js
102+
deno compile --allow-read --allow-env --allow-run --allow-sys=uid,systemMemoryInfo,gid,homedir --allow-write --allow-net --node-modules-dir=auto --allow-ffi --allow-scripts=npm:@appthreat/[email protected].4 --include=./data --include=./package.json --include=node_modules/sqlite3/build/Release --output evinse bin/evinse.js
103103
shasum -a 256 evinse > evinse.sha256
104104
chmod + evinse
105105
./evinse --help

‎ci/Dockerfile-deno‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ RUN set -e; \
8888
&& python${PYTHON_VERSION} -m pip install --no-cache-dir --upgrade setuptools==77.0.3 wheel pip virtualenv \
8989
&& python${PYTHON_VERSION} -m pip install --no-cache-dir --upgrade pipenv poetry blint atom-tools uv --target /opt/pypi \
9090
&& curl -fsSL https://deno.land/x/install/install.sh | sh \
91-
&& deno install -g --node-modules-dir=auto --allow-scripts=npm:@appthreat/[email protected].3 --allow-read --allow-env --allow-run --allow-sys=uid,systemMemoryInfo,gid,homedir --allow-write --allow-net -n cdxgen "npm:@cyclonedx/cdxgen/cdxgen" \
91+
&& deno install -g --node-modules-dir=auto --allow-scripts=npm:@appthreat/[email protected].4 --allow-read --allow-env --allow-run --allow-sys=uid,systemMemoryInfo,gid,homedir --allow-write --allow-net -n cdxgen "npm:@cyclonedx/cdxgen/cdxgen" \
9292
&& deno install -g --allow-read --allow-env --allow-run --allow-sys=uid,systemMemoryInfo,gid,homedir --allow-write -n atom "npm:@appthreat/atom/atom" \
9393
&& deno install -g --allow-read --allow-env --allow-run --allow-sys=uid,systemMemoryInfo,gid,homedir --allow-write -n astgen "npm:@appthreat/atom/astgen" \
9494
&& deno install -g --allow-read --allow-env --allow-run --allow-sys=uid,systemMemoryInfo,gid,homedir --allow-write -n phpastgen "npm:@appthreat/atom/phpastgen" \

‎deno.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
"jest": "npm:jest@^29.7.0",
9292
"@jest/globals": "npm:@jest/globals@^29.7.0",
9393
"sequelize": "npm:sequelize@^6.37.7",
94-
"sqlite3": "npm:@appthreat/sqlite3@^6.0.3",
94+
"sqlite3": "npm:@appthreat/sqlite3@^6.0.4",
9595
"body-parser": "npm:body-parser@^2.2.0",
9696
"compression": "npm:compression@^1.7.5",
9797
"connect": "npm:connect@^3.7.0",

‎devenv.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ in
9797
pnpm install --config.strict-dep-builds=true --package-import-method copy --frozen-lockfile
9898
elif command -v deno >/dev/null 2>&1; then
9999
rm -rf node_modules
100-
deno install --allow-scripts=npm:@biomejs/[email protected],npm:@appthreat/[email protected].3
100+
deno install --allow-scripts=npm:@biomejs/[email protected],npm:@appthreat/[email protected].4
101101
fi
102102
'';
103103

@@ -117,7 +117,7 @@ in
117117
tasks."deno:prepare" = {
118118
exec = ''
119119
rm -rf node_modules
120-
deno install --allow-scripts=npm:@biomejs/[email protected],npm:@appthreat/[email protected].3
120+
deno install --allow-scripts=npm:@biomejs/[email protected],npm:@appthreat/[email protected].4
121121
deno info bin/cdxgen.js
122122
deno info bin/evinse.js
123123
'';

‎lib/helpers/utils.test.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3802,8 +3802,8 @@ test("parsePnpmLock", async () => {
38023802
expect(parsedList.dependenciesList).toHaveLength(462);
38033803
expect(parsedList.pkgList.filter((pkg) => !pkg.scope)).toHaveLength(3);
38043804
parsedList = await parsePnpmLock("./pnpm-lock.yaml");
3805-
expect(parsedList.pkgList.length).toEqual(576);
3806-
expect(parsedList.dependenciesList.length).toEqual(576);
3805+
expect(parsedList.pkgList.length).toEqual(578);
3806+
expect(parsedList.dependenciesList.length).toEqual(578);
38073807
expect(parsedList.pkgList[0]).toEqual({
38083808
group: "@ampproject",
38093809
name: "remapping",

‎package.json‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -113,21 +113,23 @@
113113
"optionalDependencies": {
114114
"@appthreat/atom": "2.2.3",
115115
"@appthreat/cdx-proto": "1.0.1",
116-
"@cyclonedx/cdxgen-plugins-bin": "1.6.11",
117-
"@cyclonedx/cdxgen-plugins-bin-darwin-amd64": "1.6.11",
118-
"@cyclonedx/cdxgen-plugins-bin-darwin-arm64": "1.6.11",
119-
"@cyclonedx/cdxgen-plugins-bin-linux-amd64": "1.6.11",
120-
"@cyclonedx/cdxgen-plugins-bin-linux-arm": "1.6.11",
121-
"@cyclonedx/cdxgen-plugins-bin-linux-arm64": "1.6.11",
122-
"@cyclonedx/cdxgen-plugins-bin-linux-ppc64": "1.6.11",
123-
"@cyclonedx/cdxgen-plugins-bin-windows-amd64": "1.6.11",
124-
"@cyclonedx/cdxgen-plugins-bin-windows-arm64": "1.6.11",
116+
"@cyclonedx/cdxgen-plugins-bin": "1.6.12",
117+
"@cyclonedx/cdxgen-plugins-bin-darwin-amd64": "1.6.12",
118+
"@cyclonedx/cdxgen-plugins-bin-darwin-arm64": "1.6.12",
119+
"@cyclonedx/cdxgen-plugins-bin-linux-amd64": "1.6.12",
120+
"@cyclonedx/cdxgen-plugins-bin-linuxmusl-amd64": "1.6.12",
121+
"@cyclonedx/cdxgen-plugins-bin-linux-arm": "1.6.12",
122+
"@cyclonedx/cdxgen-plugins-bin-linux-arm64": "1.6.12",
123+
"@cyclonedx/cdxgen-plugins-bin-linuxmusl-arm64": "1.6.12",
124+
"@cyclonedx/cdxgen-plugins-bin-linux-ppc64": "1.6.12",
125+
"@cyclonedx/cdxgen-plugins-bin-windows-amd64": "1.6.12",
126+
"@cyclonedx/cdxgen-plugins-bin-windows-arm64": "1.6.12",
125127
"body-parser": "^2.2.0",
126128
"compression": "^1.7.5",
127129
"connect": "^3.7.0",
128130
"jsonata": "^2.0.6",
129131
"sequelize": "^6.37.7",
130-
"sqlite3": "npm:@appthreat/sqlite3@^6.0.3"
132+
"sqlite3": "npm:@appthreat/sqlite3@^6.0.4"
131133
},
132134
"files": ["*.js", "lib/**", "bin/", "data/", "types/", "index.cjs"],
133135
"devDependencies": {

‎pnpm-lock.yaml‎

Lines changed: 75 additions & 53 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)