Skip to content

chore: resolve lockfile conflict blocking upmerge to edge - #2069

Merged
DariuszPorowski merged 6 commits into
v0.62from
copilot/fix-failing-github-actions-job
Oct 29, 2026
Merged

DariuszPorowski merged 6 commits into
v0.62from
copilot/fix-failing-github-actions-job

Conversation

Copilot AI commented Oct 29, 2026 •

Copy link
Copy Markdown
Contributor

Summary

  • Dependencies: Align Hugo (0.168.0) and PostCSS (^8.5.31) with edge, retaining the registry-URL-free lockfile.
  • History: Merge edge and resolve the lockfile conflict without changing release-specific site configuration.

Merge without squashing or rebasing: the resolution depends on preserving merge ancestry.

Reason for change

The “upmerge / Upmerge to edge” job failed because edge updated dependencies while v0.62 removed registry URLs from overlapping lockfile entries. Matching versions alone leaves conflicting URL edits; recording the resolved merge addresses both content and ancestry.

How to test

With the PR branch checked out and origin/edge current:

git merge-tree --write-tree origin/edge HEAD
cd docs
npm ci
npm run hugo:version

Expect no merge conflicts, successful installation, and Hugo 0.168.0.

File change summary

File Summary of change
docs/package.json Align Hugo and PostCSS versions with edge.
docs/package-lock.json Update versions and integrity hashes; retain omitted registry URLs.
.github/scripts/release-docs.sh Bring in existing signed-release verification from edge.
.github/scripts/release-docs_test.sh Bring in existing release-script tests from edge.
.github/workflows/lockfile-registry-policy.yml Bring in existing registry-policy workflow from edge.
.github/workflows/release.yaml Bring in existing release-verification wiring from edge.
.github/workflows/website.yaml Bring in existing website workflow updates from edge.
docs/content/contributing/contributing-docs/index.md Bring in existing release guidance from edge.

dependabot Bot and others added 4 commits October 27, 2026 22:05
…es (#2065)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Co-authored-by: radius-files-sync[bot] <248604391+radius-files-sync[bot]@users.noreply.github.com>
Copilot AI and others added 2 commits October 29, 2026 00:25
Co-authored-by: DariuszPorowski <3431813+DariuszPorowski@users.noreply.github.com>
Signed-off-by: GitHub <noreply@github.com>

Co-authored-by: DariuszPorowski <3431813+DariuszPorowski@users.noreply.github.com>
Copilot AI changed the title [WIP] Fix failing GitHub Actions job upmerge to edge Resolve lockfile conflict blocking upmerge to edge Oct 29, 2026
Copilot AI requested a review from DariuszPorowski October 29, 2026 00:27
@DariuszPorowski
DariuszPorowski marked this pull request as ready for review October 29, 2026 03:19
@DariuszPorowski
DariuszPorowski requested review from a team as code owners October 29, 2026 03:19
@DariuszPorowski
DariuszPorowski requested a review from a team as a code owner October 29, 2026 03:20
@github-actions

Copy link
Copy Markdown

Dependency Review

The following issues were found:
  • ✅ 0 vulnerable package(s)
  • ✅ 0 package(s) with incompatible licenses
  • ✅ 0 package(s) with invalid SPDX license definitions
  • ✅ 0 package(s) with unknown licenses.
  • ⚠️ 1 packages with OpenSSF Scorecard issues.
See the Details below.

OpenSSF Scorecard

PackageVersionScoreDetails
actions/radius-project/.github/.github/workflows/__lockfile-registry-policy.yml main UnknownUnknown
npm/hugo-extended 0.168.0 ⚠️ 3.7
Details
CheckScoreReason
Code-Review⚠️ 0Found 0/4 approved changesets -- score normalized to 0
Maintained⚠️ 34 commit(s) and 0 issue activity found in the last 90 days -- score normalized to 3
Binary-Artifacts🟢 10no binaries found in the repo
Dangerous-Workflow🟢 10no dangerous workflow patterns detected
Token-Permissions⚠️ 0detected GitHub workflow tokens with excessive permissions
Pinned-Dependencies⚠️ 3dependency not pinned by hash detected -- score normalized to 3
CII-Best-Practices⚠️ 0no effort to earn an OpenSSF best practices badge detected
Security-Policy⚠️ 0security policy file not detected
Fuzzing⚠️ 0project is not fuzzed
License🟢 10license file detected
Signed-Releases⚠️ -1no releases found
Branch-Protection⚠️ 0branch protection not enabled on development/release branches
Packaging🟢 10packaging workflow detected
SAST⚠️ 0SAST tool is not run on all commits -- score normalized to 0
npm/postcss 8.5.31 🟢 7.4
Details
CheckScoreReason
Dangerous-Workflow🟢 10no dangerous workflow patterns detected
Security-Policy🟢 10security policy file detected
Packaging⚠️ -1packaging workflow not detected
Code-Review⚠️ 2Found 7/30 approved changesets -- score normalized to 2
Maintained🟢 1030 commit(s) and 11 issue activity found in the last 90 days -- score normalized to 10
Binary-Artifacts🟢 10no binaries found in the repo
Token-Permissions🟢 9detected GitHub workflow tokens with excessive permissions
Pinned-Dependencies🟢 10all dependencies are pinned
CII-Best-Practices⚠️ 0no effort to earn an OpenSSF best practices badge detected
License🟢 10license file detected
Fuzzing🟢 10project is fuzzed
Signed-Releases⚠️ -1no releases found
Branch-Protection⚠️ 3branch protection is not maximal on development and all release branches
SAST⚠️ 1SAST tool is not run on all commits -- score normalized to 1

Scanned Files

  • .github/workflows/lockfile-registry-policy.yml
  • docs/package-lock.json

@DariuszPorowski
DariuszPorowski enabled auto-merge (squash) October 29, 2026 03:20
@github-actions

Copy link
Copy Markdown

Static Web App Preview

Environment Deployment
pr2069 View workflow run

Deployed from commit a455232dac73c5057c3e2a14608137996356eaaf via the publisher workflow.

@DariuszPorowski DariuszPorowski changed the title Resolve lockfile conflict blocking upmerge to edge chore: resolve lockfile conflict blocking upmerge to edge Oct 29, 2026
@DariuszPorowski
DariuszPorowski merged commit 5cbd87a into v0.62 Oct 29, 2026
21 checks passed
@DariuszPorowski
DariuszPorowski deleted the copilot/fix-failing-github-actions-job branch October 29, 2026 18:59

This branch was successfully deployed

1 active deployment
latest — a455232d Deployed Oct 29, 2026 by Copilot via Dispatch Static Web App Preview #7116
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants