Skip to content

Commit 14d00dc

Browse files
authored
fix: Merge pull request #333 from Automattic/trunk
Alpha release Jan 10
2 parents a0258a1 + 77948bb commit 14d00dc

File tree

7 files changed

+415
-509
lines changed

7 files changed

+415
-509
lines changed

.github/labeler.yml

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
needs-changelog:
2+
- base-branch: ['trunk']

.github/workflows/changelog.yml

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: "Pull Request Labeler"
2+
on:
3+
pull_request:
4+
types: [closed]
5+
6+
jobs:
7+
labeler:
8+
if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'trunk' && github.event.pull_request.user.login != 'dependabot[bot]'
9+
permissions:
10+
contents: read
11+
pull-requests: write
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/labeler@v5
15+
16+
comment_pr:
17+
if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'trunk' && github.event.pull_request.user.login != 'dependabot[bot]'
18+
permissions:
19+
contents: read
20+
pull-requests: write
21+
runs-on: ubuntu-latest
22+
name: Comment about the change log label
23+
steps:
24+
- name: Comment PR
25+
uses: thollander/actions-comment-pull-request@v3
26+
with:
27+
message: |
28+
Hey @${{ github.event.pull_request.user.login }}, good job getting this PR merged! :tada:
29+
30+
Now, the `needs-changelog` label has been added to it.
31+
32+
Please check if this PR needs to be included in the "Upcoming Changes" and "Release Notes" doc. If it doesn't, simply remove the label.
33+
34+
If it does, please add an entry to our shared document, with screenshots and testing instructions if applicable, then remove the label.
35+
36+
Thank you! :heart:

.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
runs-on: ubuntu-latest
77
steps:
88
- name: Label when approved
9-
uses: pullreminders/label-when-approved-action@master
9+
uses: abinoda/label-when-approved-action@master
1010
env:
1111
APPROVALS: '1'
1212
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"require-dev": {
77
"automattic/vipwpcs": "^3.0",
88
"wp-coding-standards/wpcs": "^3.0",
9-
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
9+
"dealerdirect/phpcodesniffer-composer-installer": "^1.0.0",
1010
"phpcompatibility/phpcompatibility-wp": "^2.1",
1111
"brainmaestro/composer-git-hooks": "^2.8"
1212
},

composer.lock

+22-19
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)