Skip to content

Commit

Permalink
Merge pull request #184 from Automattic/trunk
Browse files Browse the repository at this point in the history
Alpha release Jan 10
  • Loading branch information
dkoo authored Jan 10, 2025
2 parents 48c27e0 + 74c9119 commit 33f1264
Show file tree
Hide file tree
Showing 39 changed files with 3,781 additions and 15 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

jobs:
labeler:
if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'trunk'
if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'trunk' && github.event.pull_request.user.login != 'dependabot[bot]'
permissions:
contents: read
pull-requests: write
Expand All @@ -14,7 +14,7 @@ jobs:
- uses: actions/labeler@v5

comment_pr:
if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'trunk'
if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'trunk' && github.event.pull_request.user.login != 'dependabot[bot]'
permissions:
contents: read
pull-requests: write
Expand All @@ -25,7 +25,7 @@ jobs:
uses: thollander/actions-comment-pull-request@v3
with:
message: |
Hey @${{ github.event.pull_request.assignee.login }}, good job getting this PR merged! :tada:
Hey @${{ github.event.pull_request.user.login }}, good job getting this PR merged! :tada:
Now, the `needs-changelog` label has been added to it.
Expand Down
4 changes: 4 additions & 0 deletions includes/class-accepted-actions.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ class Accepted_Actions {
'network_manual_sync_user' => 'User_Manually_Synced',
'network_nodes_synced' => 'Nodes_Synced',
'newspack_network_membership_plan_updated' => 'Membership_Plan_Updated',
'network_post_updated' => 'Network_Post_Updated',
'network_post_deleted' => 'Network_Post_Deleted',
];

/**
Expand All @@ -61,5 +63,7 @@ class Accepted_Actions {
'network_nodes_synced',
'newspack_node_subscription_changed',
'newspack_network_membership_plan_updated',
'network_post_updated',
'network_post_deleted',
];
}
Loading

0 comments on commit 33f1264

Please sign in to comment.