Skip to content

Conversation

hc-github-team-nomad-core
Copy link
Contributor

Backport

This PR is auto-generated from #26833 to be assessed for backporting due to the inclusion of the label backport/1.10.x.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@aklkv
This person should resolve the merge-conflict(s) by either:

  • Manually completing the cherry picks into this branch
  • Creating a new branch and manually cherry-picking all commits being backported

merge conflict error: POST https://api.github.com/repos/hashicorp/nomad/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


Description

resolve: #26801

While migrating to pnpm which has much stricter dependancies resolution rules we missed a couple of deps that needs to be explicitly installed such as one that broke flyout component @ember/test-helpers

Testing & Reproduction steps

Links

NMD-1004

Contributor Checklist

  • Changelog Entry If this PR changes user-facing behavior, please generate and add a
    changelog entry using the make cl command.
  • Testing Please add tests to cover any new functionality or to demonstrate bug fixes and
    ensure regressions will be caught.
  • Documentation If the change impacts user-facing functionality such as the CLI, API, UI,
    and job configuration, please update the Nomad website documentation to reflect this. Refer to
    the website README for docs guidelines. Please also consider whether the
    change requires notes within the upgrade guide.

Reviewer Checklist

  • Backport Labels Please add the correct backport labels as described by the internal
    backporting document.
  • Commit Type Ensure the correct merge method is selected which should be "squash and merge"
    in the majority of situations. The main exceptions are long-lived feature branches or merges where
    history should be preserved.
  • Enterprise PRs If this is an enterprise only PR, please add any required changelog entry
    within the public repository.
  • If a change needs to be reverted, we will roll out an update to the code within 7 days.

Changes to Security Controls

Are there any changes to security controls (access controls, encryption, logging) in this pull request? If so, explain.


Overview of commits

Copy link

hashicorp-cla-app bot commented Oct 17, 2025

CLA assistant check
All committers have signed the CLA.

@jrasell jrasell force-pushed the backport/fix/missing-deps/completely-related-javelin branch from bf6fc34 to c4d49e0 Compare October 17, 2025 12:36
@jrasell jrasell marked this pull request as ready for review October 20, 2025 07:42
@jrasell jrasell requested review from a team as code owners October 20, 2025 07:42
@jrasell jrasell merged commit e5fd1fa into release/1.10.x Oct 20, 2025
50 of 51 checks passed
@jrasell jrasell deleted the backport/fix/missing-deps/completely-related-javelin branch October 20, 2025 07:50
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.

4 participants