diff --git a/.github/workflows/check-formats.yml b/.github/workflows/check-formats.yml index e94ca09ae2..092dabe309 100644 --- a/.github/workflows/check-formats.yml +++ b/.github/workflows/check-formats.yml @@ -20,7 +20,7 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - name: Install dependencies - run: cpanm -n Perl::Tidy@20220613 + run: cpanm -n Perl::Tidy@20240903 - name: Run perltidy shell: bash run: | diff --git a/.perltidyrc b/.perltidyrc index 4620751c6f..8314b7c173 100644 --- a/.perltidyrc +++ b/.perltidyrc @@ -20,4 +20,3 @@ -nlop # No logical padding (this causes mixed tabs and spaces) -wn # Weld nested containers -xci # Extended continuation indentation --vxl='q' # No vertical alignment of qw quotes diff --git a/bin/check_modules.pl b/bin/check_modules.pl index 428cb83094..8731bc7504 100755 --- a/bin/check_modules.pl +++ b/bin/check_modules.pl @@ -165,7 +165,6 @@ =head1 DESCRIPTION 'LWP::Protocol::https' => 6.06, 'Mojolicious' => 9.34, 'Net::SSLeay' => 1.46, - 'Perl::Tidy' => 20220613, 'SQL::Abstract' => 2.000000 ); diff --git a/bin/dev_scripts/run-perltidy.pl b/bin/dev_scripts/run-perltidy.pl index 1c882f608f..70f60faece 100755 --- a/bin/dev_scripts/run-perltidy.pl +++ b/bin/dev_scripts/run-perltidy.pl @@ -63,9 +63,8 @@ =head1 OPTIONS my $webwork_root = curfile->dirname->dirname->dirname; -die "Version 20220613 or newer of perltidy is required for this script.\n" - . "The installed version is $Perl::Tidy::VERSION.\n" - unless $Perl::Tidy::VERSION >= 20220613; +die "Version 20240903 of perltidy is required for this script.\nThe installed version is $Perl::Tidy::VERSION.\n" + unless $Perl::Tidy::VERSION == 20240903; die "The .perltidyrc file in the webwork root directory is not readable.\n" unless -r "$webwork_root/.perltidyrc";