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

Release Nov 25 #1372

Merged
merged 9 commits into from
Nov 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
needs-changelog:
- base-branch: ['trunk']
36 changes: 36 additions & 0 deletions .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: "Pull Request Labeler"
on:
pull_request:
types: [closed]

jobs:
labeler:
if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'trunk'
permissions:
contents: read
pull-requests: write
runs-on: ubuntu-latest
steps:
- uses: actions/labeler@v5

comment_pr:
if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'trunk'
permissions:
contents: read
pull-requests: write
runs-on: ubuntu-latest
name: Comment about the change log label
steps:
- name: Comment PR
uses: thollander/actions-comment-pull-request@v3
with:
message: |
Hey @${{ github.event.pull_request.assignee.login }}, good job getting this PR merged! :tada:

Now, the `needs-changelog` label has been added to it.

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.

If it does, please add an entry to our shared document, with screenshots and testing instructions if applicable, then remove the label.

Thank you! :heart:
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Label when approved
uses: pullreminders/label-when-approved-action@master
uses: abinoda/label-when-approved-action@master
env:
APPROVALS: '1'
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
5 changes: 5 additions & 0 deletions includes/class-newspack-segments-model.php
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,11 @@ public static function get_segments( $include_inactive = true ) {
]
);

// if, for any reason, this was called too early and we don't have a registered taxonomy yet, let's not break the site.
if ( ! is_array( $terms ) ) {
return [];
}

$segments = array_map(
function ( $segment ) {
return self::get_segment_from_term( $segment );
Expand Down
2 changes: 1 addition & 1 deletion newspack-popups.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* Author URI: https://newspack.com
* Text Domain: newspack-popups
* Domain Path: /languages
* Version: 3.1.2
* Version: 3.1.3-alpha.1
*
* @package Newspack_Popups
*/
Expand Down
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"classnames": "^2.5.1",
"intersection-observer": "^0.12.2",
"js-cookie": "^3.0.5",
"newspack-components": "^3.0.0",
"newspack-components": "^3.1.0",
"qs": "^6.13.0"
},
"devDependencies": {
Expand Down