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.

Sign up for GitHub

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

Add blocker if cPanel is not running version 110 #343

Merged
merged 2 commits into from
Jan 11, 2024
Merged

Add blocker if cPanel is not running version 110 #343

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1619b1e
Add blocker if cPanel is not running version 110
cPholloway Jan 10, 2024
e6e353e
Update changelog
toddr Jan 11, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/testsuite.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ jobs:
env:
PERL_USE_UNSAFE_INC: 1
CPANEL_BIN_PATH: /usr/local/cpanel/3rdparty/bin
CPANEL_PERL: /usr/local/cpanel/3rdparty/perl/532/bin/perl
CPANEL_PERL: /usr/local/cpanel/3rdparty/perl/536/bin/perl

runs-on: ubuntu-latest

strategy:
fail-fast: false

container:
image: cpanelos/perl-compiler:perl-v5.32.0
image: cpanelos/perl-compiler:perl-v5.36.0

steps:
- name: Checkout
Expand Down
6 changes: 6 additions & 0 deletions changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
2024-01-10 - version 20
- #337 - Add blocker if cPanel is not running version 110

2024-01-10 - version 19
- Use canonical_dump() when building JSON for repo blocker reports

2024-01-09 - version 18
- #332 - Suppress additional checks when run with --check --no-leapp

Expand Down
4 changes: 2 additions & 2 deletions elevate-cpanel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ BEGIN { # Suppress load of all of these at earliest point.

package Elevate::Constants;

use constant MINIMUM_LTS_SUPPORTED => 102;
use constant MINIMUM_LTS_SUPPORTED => 110;
use constant MAXIMUM_LTS_SUPPORTED => 110;

use constant SERVICE_DIR => '/etc/systemd/system/';
Expand Down Expand Up @@ -4856,7 +4856,7 @@ BEGIN {
$Cpanel::Version::Tiny::major_version >= Elevate::Constants::MINIMUM_LTS_SUPPORTED
or do {
warn qq[You need to upgrade your cPanel server to version ] . Elevate::Constants::MINIMUM_LTS_SUPPORTED #
. qq[or later before running this script.\n];
. qq[ or later before running this script.\n];
exit 1;
};
}
Expand Down
2 changes: 1 addition & 1 deletion lib/Elevate/Constants.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ if their usage is self contained.

=cut

use constant MINIMUM_LTS_SUPPORTED => 102;
use constant MINIMUM_LTS_SUPPORTED => 110;
use constant MAXIMUM_LTS_SUPPORTED => 110;

use constant SERVICE_DIR => '/etc/systemd/system/';
Expand Down
2 changes: 1 addition & 1 deletion script/elevate-cpanel.PL
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ BEGIN {
$Cpanel::Version::Tiny::major_version >= Elevate::Constants::MINIMUM_LTS_SUPPORTED
or do {
warn qq[You need to upgrade your cPanel server to version ] . Elevate::Constants::MINIMUM_LTS_SUPPORTED #
. qq[or later before running this script.\n];
. qq[ or later before running this script.\n];
exit 1;
};
}
Expand Down
8 changes: 4 additions & 4 deletions t/cpanel-setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -e

ULC=/usr/local/cpanel
VERSION=11.102.0.1
VERSION=11.110.0.17
REPO=$(pwd)

yum clean all
Expand Down Expand Up @@ -31,17 +31,17 @@ echo "# ............. setup symlinks"
ln -sf usr/local/cpanel/scripts /scripts
ln -sf /bin/true /usr/local/cpanel/bin/build_locale_databases
ln -sf /bin/true /usr/local/cpanel/scripts/restartsrv_tailwatchd
ln -sf /usr/local/cpanel/3rdparty/perl/532/bin/perl /usr/local/cpanel/3rdparty/bin/perl
ln -sf /usr/local/cpanel/3rdparty/perl/536/bin/perl /usr/local/cpanel/3rdparty/bin/perl

echo "CPANEL=${VERSION}" > /etc/cpupdate.conf

echo "# ............. /scripts/fix-cpanel-perl"
rm -f /usr/local/cpanel/3rdparty/perl/532/bin/perl
rm -f /usr/local/cpanel/3rdparty/perl/536/bin/perl
/scripts/fix-cpanel-perl ||:

echo "# ............. which perl"
which perl
ls -l /usr/local/cpanel/3rdparty/perl/532/bin/perl
ls -l /usr/local/cpanel/3rdparty/perl/536/bin/perl

echo "# ............. cpanm round 2"
#perl bin/cpanm -n Params::Util
Expand Down