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

[Backport 1.x] Bump node-sass to a version based on [email protected] #984

Merged
merged 1 commit into from
Aug 22, 2023

Conversation

opensearch-trigger-bot[bot]
Copy link

Backport 24fb2b1 from #977.

* Update to libsass 3.6.5

Signed-off-by: Matt Provost <[email protected]>

* Update changelog

Signed-off-by: Matt Provost <[email protected]>

* Revert extraneous yarn lock changes

Signed-off-by: Matt Provost <[email protected]>

* Remove incorrect comments

Signed-off-by: Matt Provost <[email protected]>

---------

Signed-off-by: Matt Provost <[email protected]>
(cherry picked from commit 24fb2b1)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

# Conflicts:
#	CHANGELOG.md
Copy link
Contributor

@BSFishy BSFishy left a comment

Choose a reason for hiding this comment

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

why do none of these update the changelog?

@joshuarrrr
Copy link
Member

Because there's almost always conflicts in the CHANGELOG that would otherwise cause the backport automation to fail. The autocut label basically tells the changelog verifier workflow to skip.

@AMoo-Miki
Copy link
Collaborator

why do none of these update the changelog?

If there is a conflict in CHANGELOG, it is asked to ignore them to allow for a successful backport.

@AMoo-Miki AMoo-Miki merged commit a5c726d into 1.x Aug 22, 2023
18 of 21 checks passed
@github-actions github-actions bot deleted the backport/backport-977-to-1.x branch August 22, 2023 17:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants