Skip to content
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

Jump to bottom

RUN protocol governance to start PSM, runStake, etc. #5165

Merged
merged 7 commits into from
Apr 22, 2022
Merged

RUN protocol governance to start PSM, runStake, etc. #5165

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
80a9d5c
chore(cosmic-swingset): shorter VOTING_PERIOD
dckc Apr 20, 2022
9a61797
chore(cosmic-swingset): runStake gov Makefile stanzas
dckc Apr 20, 2022
8241a0e
feat(deploy-script-support): persist option for installInPieces
dckc Apr 19, 2022
b42cd8c
chore(vats): add psm to agoricNames, boot types
dckc Apr 21, 2022
1bbde6d
fix(agoric-cli): path handling
dckc Apr 21, 2022
2c98994
feat(run-protocol): runStake, PSM bootstrap
dckc Apr 19, 2022
6445fb2
Merge branch 'master' into dc-boot-psm-runStake
mergify[bot] Apr 22, 2022
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 packages/agoric-cli/src/deploy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ export default async function deployMain(progname, rawArgs, powers, opts) {
paths: [...paths, path.dirname(moduleFile)],
});
} catch (e) {
return path.resolve(...paths, fileName);
return path.resolve(path.dirname(moduleFile), ...paths, fileName);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why was path.dirname(moduleFile) added before ...paths ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nmv, this is correct and it's the paths for require.resolve above that isn't correct.

}
};
console.warn('running', moduleFile);
Expand Down