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

Update dependency xss to v1.0.15 #85215

Merged
merged 1 commit into from
Mar 27, 2024
Merged

Conversation

renovate[bot]
Copy link
Contributor

@renovate renovate bot commented Mar 26, 2024

Mend Renovate

This PR contains the following updates:

Package Change Age Adoption Passing Confidence
xss 1.0.14 -> 1.0.15 age adoption passing confidence

Warning

Some dependencies could not be looked up. Check the Dependency Dashboard for more information.


Release Notes

leizongmin/js-xss (xss)

v1.0.15

Compare Source


Configuration

📅 Schedule: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 Automerge: Disabled because a matching PR was automerged previously.

Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update again.


  • If you want to rebase/retry this PR, check this box

This PR has been generated by Mend Renovate. View repository job log here.

@renovate renovate bot requested a review from a team as a code owner March 26, 2024 20:07
@renovate renovate bot added area/frontend dependencies Pull requests that update a dependency file no-changelog Skip including change in changelog/release notes labels Mar 26, 2024
@renovate renovate bot requested review from kaydelaney and removed request for a team March 26, 2024 20:07
@grafana-delivery-bot grafana-delivery-bot bot added this to the 11.1.x milestone Mar 26, 2024
Copy link
Contributor

@ashharrison90 ashharrison90 left a comment

Choose a reason for hiding this comment

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

lgtm bot 🤖

@ashharrison90 ashharrison90 enabled auto-merge (squash) March 27, 2024 09:30
@ashharrison90 ashharrison90 merged commit 869a7c8 into main Mar 27, 2024
21 checks passed
@ashharrison90 ashharrison90 deleted the renovate/xss-1.x-lockfile branch March 27, 2024 09:47
@ashharrison90 ashharrison90 modified the milestones: 11.1.x, 11.0.0-preview Apr 16, 2024
@ashharrison90 ashharrison90 added product-approved Pull requests that are approved by product/managers and are allowed to be backported backport v11.0.x Mark PR for automatic backport to v11.0.x labels Apr 16, 2024
Copy link
Contributor

The backport to v11.0.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-85215-to-v11.0.x origin/v11.0.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 869a7c8e15ebf5617958336af52e8566c2837e53

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-85215-to-v11.0.x
# Create the PR body template
PR_BODY=$(gh pr view 85215 --json body --template 'Backport 869a7c8e15ebf5617958336af52e8566c2837e53 from #85215{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[v11.0.x] Update dependency xss to v1.0.15" --body-file - --label "area/frontend" --label "dependencies" --label "no-changelog" --label "product-approved" --label "backport" --base v11.0.x --milestone 11.0.x --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-85215-to-v11.0.x

# Create a pull request where the `base` branch is `v11.0.x` and the `compare`/`head` branch is `backport-85215-to-v11.0.x`.

# Remove the local backport branch
git switch main
git branch -D backport-85215-to-v11.0.x

@grafana-delivery-bot grafana-delivery-bot bot added the backport-failed Failed to generate backport PR. Please resolve conflicts and create one manually. label Apr 16, 2024
@ashharrison90 ashharrison90 added backport v11.0.x Mark PR for automatic backport to v11.0.x and removed backport-failed Failed to generate backport PR. Please resolve conflicts and create one manually. backport v11.0.x Mark PR for automatic backport to v11.0.x labels Apr 16, 2024
grafana-delivery-bot bot pushed a commit that referenced this pull request Apr 16, 2024
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit 869a7c8)
ashharrison90 pushed a commit that referenced this pull request Apr 16, 2024
Update dependency xss to v1.0.15 (#85215)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit 869a7c8)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/frontend backport v11.0.x Mark PR for automatic backport to v11.0.x dependencies Pull requests that update a dependency file no-changelog Skip including change in changelog/release notes product-approved Pull requests that are approved by product/managers and are allowed to be backported
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant