Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

ci: Update merge conflict labeler#28023

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
dstansby merged 1 commit intomatplotlib:mainfromQuLogic:update-conflict-check
Apr 7, 2024

Conversation

QuLogic
Copy link
Member

@QuLogicQuLogic commentedApr 4, 2024
edited
Loading

PR summary

This should fix the warning about deprecated nodejs.

Also, changing from the branch name to a tagged commit should be more stable, and I think will fix dependabot to start auto-updating this one.

PR checklist

This should fix the warning about deprecated nodejs.
@QuLogic
Copy link
MemberAuthor

Note also that this won't have any effect here because it runs on thepull_request_target trigger, and that doesn't use the PR contents for security reasons. But you can see this action running on my fork athttps://github.com/QuLogic/matplotlib/actions/runs/8560979186

@@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check if PRs have merge conflicts
uses: eps1lon/actions-label-merge-conflict@releases/2.x
uses: eps1lon/actions-label-merge-conflict@e62d7a53ff8be8b97684bffb6cfbbf3fc1115e2e # v3.0.0
Copy link
Member

Choose a reason for hiding this comment

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

I assume using the hash for paranoia reasons?

Copy link
MemberAuthor

Choose a reason for hiding this comment

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

Yes,@matthewfeickert did this elsewhere for us in#26025.

Copy link
Contributor

Choose a reason for hiding this comment

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

There's no real downside to using the hash, but for the record I generally only care about using it when it comes to supply chain security. I'll defer to you all on ifhttps://github.com/eps1lon/actions-label-merge-conflict is critical enough to your infrastructure that it needs hashes or not (they will get autoupdated by Dependabot either way).

Copy link
MemberAuthor

Choose a reason for hiding this comment

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

It's not super privileged, but it does havePR write permissions.

matthewfeickert reacted with thumbs up emoji
@dstansbydstansby added this to thev3.9.0 milestoneApr 7, 2024
@dstansbydstansby merged commitf799b00 intomatplotlib:mainApr 7, 2024
meeseeksmachine pushed a commit to meeseeksmachine/matplotlib that referenced this pull requestApr 7, 2024
rcomer added a commit that referenced this pull requestApr 7, 2024
…023-on-v3.9.xBackport PR#28023 on branch v3.9.x (ci: Update merge conflict labeler)
@QuLogicQuLogic deleted the update-conflict-check branchApril 7, 2024 23:01
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Reviewers

@tacaswelltacaswelltacaswell approved these changes

@matthewfeickertmatthewfeickertmatthewfeickert left review comments

@dstansbydstansbydstansby approved these changes

Assignees
No one assigned
Projects
None yet
Milestone
v3.9.0
Development

Successfully merging this pull request may close these issues.

4 participants
@QuLogic@tacaswell@matthewfeickert@dstansby

[8]ページ先頭

©2009-2025 Movatter.jp