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

fix: use dapp-offer-up by default #8630

Merged
merged 9 commits into from
Jan 26, 2024
Merged

fix: use dapp-offer-up by default #8630

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c263f3b
use dapp-game-pieces (in agoric-labs) by default
dckc Dec 6, 2023
b3ad188
feat: use dapp-offer-up in @agoric/dapp
dckc Dec 14, 2023
2097951
fix(integration-test): update initOptions with '--dapp-template' para…
LuqiPan Jan 25, 2024
8ec4ed3
fix(integration-test): set --dapp-template at registry.sh level
LuqiPan Jan 25, 2024
9c7dc74
Revert "fix(integration-test): update initOptions with '--dapp-templa…
LuqiPan Jan 25, 2024
cf37902
Revert "fix(integration-test): set --dapp-template at registry.sh level"
LuqiPan Jan 26, 2024
35acc3d
fix(integration-test): add --dapp-template parameter to myMain command
LuqiPan Jan 26, 2024
9196b92
fixup! fix(integration-test): add --dapp-template parameter to myMain…
LuqiPan Jan 26, 2024
3c69847
Merge branch 'master' into dckc-patch-1
mergify[bot] Jan 26, 2024
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/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import followMain from './follow.js';
import walletMain from './open.js';
import { makeWalletCommand } from './commands/wallet.js';

const DEFAULT_DAPP_TEMPLATE = 'dapp-fungible-faucet';
const DEFAULT_DAPP_TEMPLATE = 'dapp-offer-up';
Copy link
Member

Choose a reason for hiding this comment

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

I expect the integration tests would need to be updated as well.

Copy link
Member Author

Choose a reason for hiding this comment

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

"the integration tests"?

hmm.. I see https://github.com/Agoric/agoric-sdk/blob/master/.github/workflows/integration.yml#L39
programming in yaml... I'm struggling to follow... seems to lead to...
https://github.com/Agoric/agoric-sdk/blob/master/scripts/registry.sh

But I don't see any use of yarn create @agoric/dapp. What am I missing?

Copy link
Member

Choose a reason for hiding this comment

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

agoric-sdk/.github/workflows/integration.yml

Line 97 in d61be8d

run: scripts/registry.sh test ${{ matrix.cli }} ${{steps.get-branch.outputs.result}}

Leads to

agoric-sdk/scripts/registry.sh

Line 110 in d61be8d

persistVar AGORIC_INIT_OPTIONS "[\"--dapp-branch=$2\"]"

The current getting started steps are captured in that script and another.

While neither reference the new dapp-create, that package is just a wrapper for the agoric cli.

Copy link
Member Author

Choose a reason for hiding this comment

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

another? what other? Perhaps all will become clear if I study some ci logs.

Copy link
Member

Choose a reason for hiding this comment

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

Yes, registry.sh triggers a yarn command in agoric-cli after setting up some environment variables

agoric-sdk/scripts/registry.sh

Line 117 in d61be8d

yarn integration-test

which ultimately bottoms out in https://github.com/Agoric/agoric-sdk/blob/d61be8d7fbda7dd3846cba38f8829e36bfae92a4/packages/agoric-cli/tools/getting-started.js

const DEFAULT_DAPP_URL_BASE = 'https://github.com/Agoric/';
const DEFAULT_DAPP_BRANCH = undefined;

Expand Down
1 change: 1 addition & 0 deletions packages/agoric-cli/tools/getting-started.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ export const gettingStartedWorkflowTest = async (t, options = {}) => {
if (process.env.AGORIC_INIT_OPTIONS) {
const opts = JSON.parse(process.env.AGORIC_INIT_OPTIONS);
initOptions.push(...opts);
initOptions['--dapp-template'] = 'dapp-fungible-faucet';
Copy link
Member

Choose a reason for hiding this comment

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

Pretty sure I commented on this earlier, but this isn't correct. The option needs to be set earlier so it can be overridden by env options.

Copy link
Contributor

Choose a reason for hiding this comment

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

@mhofman I ended up updating the parameter in registry.sh directly. CI seems to be passing. What do you think about this approach?

}
t.is(
await myMain(['init', ...initOptions, 'dapp-foo']),
Copy link
Member

Choose a reason for hiding this comment

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

I think the easiest is to put the default options here

Suggested change
await myMain(['init', ...initOptions, 'dapp-foo']),
await myMain(['init', '--dapp-template', 'dapp-fungible-faucet', '--dapp-base', 'https://github.com/Agoric/', ...initOptions, 'dapp-foo']),

Copy link
Contributor

Choose a reason for hiding this comment

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

Ohhh I see. Updated the PR to do that and tests are passing now, thank you!

Omitted --dapp-base because it defaults to "https://github.com/Agoric/"

Ref:

  --dapp-base <base-url>  find the template relative to <base-url> (default: "https://github.com/Agoric/")

Copy link
Member

Choose a reason for hiding this comment

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

Oh right dapp-offer-up moved to the Agoric org, so DEFAULT_DAPP_URL_BASE no longer changes in this PR!

Expand Down
Loading