Skip to content

Commit

Permalink
test: run without yarn
Browse files Browse the repository at this point in the history
  • Loading branch information
turadg committed Aug 22, 2024
1 parent 859281c commit 8fcb127
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 10 deletions.
1 change: 1 addition & 0 deletions packages/boot/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
"@agoric/swingset-liveslots": "^0.10.2",
"@endo/base64": "^1.0.6",
"@endo/patterns": "^1.4.2",
"agoric": "workspace:^",
"ava": "^5.3.0",
"c8": "^9.1.0",
"tsx": "3.12.8"
Expand Down
15 changes: 6 additions & 9 deletions packages/boot/tools/supports.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@ import { icaMocks, protoMsgMockMap, protoMsgMocks } from './ibc/mocks.js';

const trace = makeTracer('BSTSupport', false);

const cliEntrypoint = await importMetaResolve(
'agoric/src/entrypoint.js',
import.meta.url,
).then(u => new URL(u).pathname);

type ConsumeBootrapItem = <N extends string>(
name: N,
) => N extends keyof EconomyBootstrapPowers['consume']
Expand Down Expand Up @@ -156,18 +161,10 @@ export const makeProposalExtractor = ({ childProcess, fs }: Powers) => {
env: NodeJS.ProcessEnv,
) => {
console.info('running package script:', scriptPath);
const out = childProcess.execFileSync('yarn', ['bin', 'agoric'], {
return childProcess.execFileSync(cliEntrypoint, ['run', scriptPath], {
cwd: outputDir,
env,
});
return childProcess.execFileSync(
out.toString().trim(),
['run', scriptPath],
{
cwd: outputDir,
env,
},
);
};

const loadJSON = async filePath =>
Expand Down
3 changes: 2 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ __metadata:
"@endo/patterns": "npm:^1.4.2"
"@endo/promise-kit": "npm:^1.1.4"
"@endo/stream": "npm:^1.2.4"
agoric: "workspace:^"
ava: "npm:^5.3.0"
c8: "npm:^9.1.0"
import-meta-resolve: "npm:^2.2.1"
Expand Down Expand Up @@ -6286,7 +6287,7 @@ __metadata:
languageName: node
linkType: hard

"agoric@npm:^0.21.1, agoric@workspace:packages/agoric-cli":
"agoric@npm:^0.21.1, agoric@workspace:^, agoric@workspace:packages/agoric-cli":
version: 0.0.0-use.local
resolution: "agoric@workspace:packages/agoric-cli"
dependencies:
Expand Down

0 comments on commit 8fcb127

Please sign in to comment.