-
Notifications
You must be signed in to change notification settings - Fork 31
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
Fix two Lintian errors in generated Debian package #594
Open
lewart3
wants to merge
8
commits into
wp-cli:main
Choose a base branch
from
lewart3:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
1751452
Fix two Lintian errors in generated Debian package
lewart3 cd2da48
Depends: prefer generic php-mysql to php-mysqlnd
lewart3 54056c0
Restore PHP 5.6 support
lewart3 bbc405d
Create php-wpcli Lintian override file
lewart3 51513a1
Remove hardcoded date for when WP-CLI drops PHP 5.6 support
lewart3 0242ee4
Merge branch 'wp-cli:main' into main
lewart3 e677722
Update utils/wp-cli-updatedeb.sh
lewart3 02289b1
Merge branch 'wp-cli:main' into main
lewart3 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,8 +3,8 @@ | |
# Package wp-cli to be installed in Debian-compatible systems. | ||
# Only the phar file is included. | ||
# | ||
# VERSION :0.2.5 | ||
# DATE :2023-07-22 | ||
# VERSION :0.2.6 | ||
# DATE :2023-11-10 | ||
# AUTHOR :Viktor Szépe <[email protected]> | ||
# LICENSE :The MIT License (MIT) | ||
# URL :https://github.com/wp-cli/wp-cli/tree/main/utils | ||
|
@@ -31,8 +31,8 @@ Architecture: all | |
Maintainer: Alain Schlesser <[email protected]> | ||
Section: php | ||
Priority: optional | ||
Depends: php5-cli (>= 5.6) | php-cli | php7-cli, php5-mysql | php5-mysqlnd | php7.0-mysql | php7.1-mysql | php7.2-mysql | php7.3-mysql | php7.4-mysql | php8.0-mysql | php8.1-mysql | php8.2-mysql | php-mysql, mysql-client | mariadb-client | ||
Homepage: http://wp-cli.org/ | ||
Depends: php-cli | php5-cli (>= 5.6), php-mysql | php-mysqlnd | php5-mysql, default-mysql-client | virtual-mysql-client | ||
Homepage: https://wp-cli.org/ | ||
Description: wp-cli is a set of command-line tools for managing | ||
WordPress installations. You can update plugins, set up multisite | ||
installations and much more, without using a web browser. | ||
|
@@ -89,6 +89,15 @@ echo "Current version: ${WPCLI_VER}" | |
# update version | ||
sed -i -e "s/^Version: .*$/Version: ${WPCLI_VER}/" DEBIAN/control || die 6 "Version update failure" | ||
|
||
# Lintian overrides (delete this stanza for WP-CLI release that bumps PHP minimum) | ||
if ! [ -r usr/share/lintian/overrides/php-wpcli ]; then | ||
mkdir -p usr/share/lintian/overrides | ||
cat > usr/share/lintian/overrides/php-wpcli <<EOF | ||
# Support PHP 5.6 while WP-CLI does so | ||
php-wpcli: php-script-but-no-php-cli-dep php (does not satisfy php-cli:any) [usr/bin/wp] | ||
EOF | ||
fi | ||
|
||
# minimal man page | ||
if ! [ -r usr/share/man/man1/wp.1.gz ]; then | ||
mkdir -p usr/share/man/man1 &> /dev/null | ||
|
@@ -116,4 +125,4 @@ lintian --display-info --display-experimental --pedantic --show-overrides php-wp | |
# optional steps | ||
echo "sign it: dpkg-sig -k SIGNING-KEY -s builder \"${WPCLI_PKG}\"" | ||
echo "include in your repo: pushd /var/www/REPO-DIR" | ||
echo " reprepro includedeb jessie \"${WPCLI_PKG}\" && popd" | ||
echo " reprepro includedeb bookworm \"${WPCLI_PKG}\" && popd" |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What's the significance of dropping all of these dependencies?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please note that I have revised one dependency (php-mysqlnd -> php-mysql | php-mysqlnd)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm not sure about dropping PHP 5.6 support for this package, as WP-CLI in fact still supports PHP 5.6. Could we restore that part somehow?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@swissspidy, Yes ... commit 54056c0 restores PHP 5.6 support.
Downside is that Lintian reports the php-script-but-no-php-cli-dep error again.
WordPress 6.3 “Lionel” discontinued support for PHP 5 (Aug 8, 2023).
Are there any plans for WP-CLI to do the same?
If it is not imminent, I can create a lintian-override file.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not until Aug 8, 2024. See https://make.wordpress.org/cli/2019/01/15/wp-cli-php-requirements-strategy/