fix(registry): Ensure up-to-date remote before pushing#187
Merged
Conversation
jan-auer
reviewed
Mar 15, 2021
| await git.commit(`craft: release "${canonicalName}", version "${version}"`); | ||
|
|
||
| // Ensure we are still up to date with upstream | ||
| await git.pull('origin', 'master', { rebase: true }); |
Member
There was a problem hiding this comment.
There's still a chance for a race condition. What if you put this in a bounded loop?
Member
Author
There was a problem hiding this comment.
I think, at our scale it is very unlikely that we'll hit the condition you mention and a bounded loop is still a band-aid fix. When that time comes, we should look into proper queues, not more band aids.
iker-barriocanal
approved these changes
Mar 16, 2021
BYK
added a commit
that referenced
this pull request
Jul 1, 2026
## Summary Resolves 3 Dependabot alerts (**#186, #187, #188**), all the same advisory across both projects. - **Advisory:** [GHSA-h67p-54hq-rp68](GHSA-h67p-54hq-rp68) / CVE-2026-53550 — *js-yaml: Quadratic-complexity DoS in merge key handling via repeated aliases* (medium severity) - **Vulnerable:** \`>= 4.0.0, <= 4.1.1\` → **patched:** \`4.2.0\` These alerts were opened by the post-merge rescan right after #839 landed (newly-published advisory), not caused by that change. ## Fix | Alert | Manifest | Relationship | Change | |---|---|---|---| | #187 | root \`package.json\` | direct devDep | bump pinned \`js-yaml\` \`4.1.1\` → \`4.2.0\` | | #188 | root \`pnpm-lock.yaml\` | direct devDep | regenerated → \`4.2.0\` | | #186 | \`docs/pnpm-lock.yaml\` | transitive (astro/starlight) | \`pnpm.overrides\` \`js-yaml: ^4.2.0\` → resolves to \`4.3.0\` | - Root uses an exact pin (matching the repo's pinned-devDep convention, e.g. \`tar\`); docs uses an override (matching the docs override style) since js-yaml is transitive there. - Both lockfile diffs are 100% js-yaml-scoped — no unrelated drift. No \`@babel/core\`/other packages touched. ## Verification - Root: \`pnpm build\` ✅, \`pnpm test\` ✅ (1025 passed, 1 skipped), \`pnpm lint\` ✅ (0 errors), \`pnpm format:check\` ✅ (tracked files) - Docs: \`pnpm build\` ✅ (27 pages built) - \`grep "js-yaml@" pnpm-lock.yaml docs/pnpm-lock.yaml\` — only \`4.2.0\`/\`4.3.0\` remain; \`4.1.1\` gone. (\`@types/js-yaml\` is type-defs only, not the vulnerable package.)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes getsentry/publish#174