Skip to content

ci: merge staging to master #388

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maxwell-aiden merged 2 commits into from
Apr 17, 2025
Merged

ci: merge staging to master #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9849841
fix: potential fix for packaged executable
tegefaulkes Apr 17, 2025
5d62be0
0.18.4
tegefaulkes Apr 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
postBuild = ''
npm run pkg -- \
--output=out \
--bin=dist/polykey.js \
--bin=dist/polykey.mjs \
--node-version=${utils.nodeVersion} \
--platform=${platform} \
--arch=${arch}
Expand Down
2 changes: 1 addition & 1 deletion npmDepsHash
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sha256-seF0UmaonXcbXIQQMq1ZrtoYm1GmIwfK2+lUZB12jYU=
sha256-S4tLgjpsyta1Jo5Dv0+YTMRf2//EHEWpuxHWJI7FjK0=
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "polykey-cli",
"version": "0.18.3",
"version": "0.18.4",
"homepage": "https://polykey.com",
"author": "Roger Qiu",
"contributors": [
Expand Down Expand Up @@ -105,7 +105,7 @@
"node_modules/sodium-native/prebuilds/win32-x64/node.napi.node"
],
"scripts": [
"dist/polykeyWorkerManifest.mjs"
"dist/polykeyWorkerManifest.js"
]
},
"scripts": {
Expand Down
22 changes: 22 additions & 0 deletions scripts/build.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,28 @@ async function main(argv = process.argv) {
console.error('Running esbuild:');
console.error(esbuildOptions);
await esbuild.build(esbuildOptions);
// Rename worker script
console.error('Renaming worker script');
childProcess.execFileSync(
'mv',
['dist/polykeyWorkerManifest.mjs', 'dist/polykeyWorkerManifest.js'],
{
stdio: ['inherit', 'inherit', 'inherit'],
windowsHide: true,
encoding: 'utf-8',
shell: platform === 'win32' ? true : false,
},
);
childProcess.execFileSync(
'mv',
['dist/polykeyWorkerManifest.mjs.map', 'dist/polykeyWorkerManifest.js.map'],
{
stdio: ['inherit', 'inherit', 'inherit'],
windowsHide: true,
encoding: 'utf-8',
shell: platform === 'win32' ? true : false,
},
);
}
/* eslint-enable no-console */

Expand Down
Loading