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.

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

chore: Sync Endo versions 2025-01-24 #10889

Merged
merged 6 commits into from
Jan 27, 2025
Merged

Conversation

kriskowal
Copy link
Member

No description provided.

Copy link

cloudflare-workers-and-pages bot commented Jan 24, 2025

Deploying agoric-sdk with  Cloudflare Pages  Cloudflare Pages

Latest commit: 247e971
Status: ✅  Deploy successful!
Preview URL: https://ea163de6.agoric-sdk.pages.dev
Branch Preview URL: https://kris-sync-endo-2025-01-24-19.agoric-sdk.pages.dev

View logs

@mhofman mhofman added the force:integration Force integration tests to run on PR label Jan 24, 2025
@kriskowal kriskowal marked this pull request as ready for review January 24, 2025 23:37
@kriskowal kriskowal requested a review from a team as a code owner January 24, 2025 23:37
@kriskowal kriskowal force-pushed the kris-sync-endo-2025-01-24-19-20-36 branch from 4c6ea9e to c2b2f78 Compare January 24, 2025 23:44
@kriskowal kriskowal requested a review from mhofman January 24, 2025 23:44
@kriskowal
Copy link
Member Author

This is ready for review. There will be a test failure for documentation, which is expected and not required to merge. That failure will continue on master until I follow-up with a change to the documentation repository.

@kriskowal kriskowal force-pushed the kris-sync-endo-2025-01-24-19-20-36 branch from c2b2f78 to 41ed444 Compare January 25, 2025 00:09
Copy link
Member

@mhofman mhofman left a comment

Choose a reason for hiding this comment

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

Looks like some of the yarn.lock files were not deduped correctly.

a3p-integration/proposals/f:fast-usdc/yarn.lock Outdated Show resolved Hide resolved
a3p-integration/proposals/n:upgrade-next/yarn.lock Outdated Show resolved Hide resolved
a3p-integration/proposals/p:upgrade-19/yarn.lock Outdated Show resolved Hide resolved
a3p-integration/proposals/z:acceptance/yarn.lock Outdated Show resolved Hide resolved
multichain-testing/yarn.lock Outdated Show resolved Hide resolved
@kriskowal kriskowal force-pushed the kris-sync-endo-2025-01-24-19-20-36 branch from 41ed444 to 247e971 Compare January 25, 2025 08:18
@kriskowal
Copy link
Member Author

For future reference, the root lockfile is on yarn 1 and all others are on yarn 4. To dedupe yarn 1 requires npx yarn-deduplicate and yarn 4 requires yarn dedupe.

git ls-tree HEAD . -r | cut -d$'\t' -f2 | grep yarn.lock'$' | xargs -n1 dirname | while read dir; do (cd $dir; pwd; npx yarn-deduplicate || yarn dedupe); done

@kriskowal kriskowal requested a review from mhofman January 25, 2025 08:21
Copy link
Member

@mhofman mhofman left a comment

Choose a reason for hiding this comment

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

👍

@kriskowal kriskowal added the automerge:rebase Automatically rebase updates, then merge label Jan 27, 2025
@mergify mergify bot merged commit f047c93 into master Jan 27, 2025
92 of 93 checks passed
@mergify mergify bot deleted the kris-sync-endo-2025-01-24-19-20-36 branch January 27, 2025 19:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge:rebase Automatically rebase updates, then merge force:integration Force integration tests to run on PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants