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

MBS-13358 (II), MBS-13546: Upgrade Perl version to 5.38 #3239

Merged
merged 20 commits into from
Apr 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
48 changes: 1 addition & 47 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,7 @@ branch_filters: &job_filters
executors:
musicbrainz-tests:
docker:
- image: metabrainz/musicbrainz-tests:v-2024-01.419
user: root
working_directory: /home/musicbrainz/musicbrainz-server

musicbrainz-tests-perl-5-dot-30:
docker:
- image: metabrainz/musicbrainz-tests:v-2024-01.419-perl5.30
- image: metabrainz/musicbrainz-tests:v-2024-04.perl5.38
user: root
working_directory: /home/musicbrainz/musicbrainz-server

Expand Down Expand Up @@ -59,49 +53,9 @@ jobs:
- store_test_results:
path: ./junit_output

js-perl-and-pgtap-perl-5-dot-30:
executor: musicbrainz-tests-perl-5-dot-30
steps:
- restore_cache:
keys:
- v1-source-{{ .Branch }}-{{ .Revision }}
- v1-source-{{ .Branch }}-
- v1-source-
- checkout
- run: |
chown -R musicbrainz:musicbrainz .
# The checkout step configures git to skip gc, so we run it
# here to reduce .git's size before saving it to cache.
sudo -E -H -u musicbrainz git gc
- save_cache:
key: v1-source-{{ .Branch }}-{{ .Revision }}
paths:
- ".git"

- restore_cache:
keys:
- v2-perl-5-dot-30-{{ checksum "yarn.lock" }}
- v2-perl-5-dot-30-
- run: |
chown -R musicbrainz:musicbrainz .
corepack enable
sudo -E -H -u musicbrainz yarn
- save_cache:
key: v2-perl-5-dot-30-{{ checksum "yarn.lock" }}
paths:
- "node_modules"

- run: |
./docker/musicbrainz-tests/run_circleci_tests.sh

- store_test_results:
path: ./junit_output

workflows:
version: 2.1
build-and-test:
jobs:
- js-perl-and-pgtap:
<<: *job_filters
- js-perl-and-pgtap-perl-5-dot-30:
<<: *job_filters
11 changes: 1 addition & 10 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,7 @@
/admin/apache/vh_mb_frontend.conf
/admin/apache/startup.pl
/admin/replication/hooks/post-process
/docker/Dockerfile.cpanfile-snapshot
/docker/Dockerfile.json-dump
/docker/Dockerfile.production-cron
/docker/Dockerfile.search-indexes-dump
/docker/Dockerfile.sitemaps
/docker/Dockerfile.test-database
/docker/Dockerfile.tests
/docker/Dockerfile.webservice
/docker/Dockerfile.website
/docker/Dockerfile.website-test
/docker/Dockerfile.*
/root/robots.txt
# Symlinks to node_modules/leaflet/
/root/static/images/leaflet/layers-2x.png
Expand Down
2 changes: 1 addition & 1 deletion INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Prerequisites
**This document will assume you are using Ubuntu (at least 14.04) for its
instructions.**

2. Perl (at least version 5.30)
2. Perl (at least version 5.38)

Perl comes bundled with most Linux operating systems, you can check your
installed version of Perl with:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ General Prerequisites:

* Ubuntu/Debian (or some other Unix-like operating system at your own risks)
* Node (at least version 20)
* Perl (at least version 5.30)
* Perl (at least version 5.38)
* PostgreSQL (at least version 12)

Reporting bugs
Expand Down
20 changes: 10 additions & 10 deletions cpanfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
requires 'perl' => '5.30.0';
requires 'perl' => '5.38.0';

# Mandatory modules
requires 'Algorithm::Diff' => '1.1902';
Expand Down Expand Up @@ -28,7 +28,7 @@ requires 'DateTime::Format::Duration' => '1.04';
requires 'DateTime::Format::ISO8601' => '0.08';
requires 'DateTime::Format::Natural' => '1.08';
requires 'DateTime::Format::Pg' => '0.16013';
requires 'DateTime::Locale' => '== 1.40';
requires 'DateTime::Locale' => '== 1.41';
requires 'DateTime::TimeZone' => '2.38';
requires 'DBD::Pg' => '3.10.0';
requires 'DBI' => '1.642';
Expand All @@ -37,11 +37,11 @@ requires 'Digest::HMAC_SHA1' => '1.03';
requires 'Digest::MD5' => '2.52';
requires 'Digest::MD5::File' => '0.08';
requires 'Digest::SHA' => '5.86';
requires 'Email::Address' => '1.900';
requires 'Email::MIME' => '1.925';
requires 'Email::MIME::Creator' => '1.925';
requires 'Email::Sender' => '1.300010';
requires 'Email::Valid' => '1.192';
requires 'Email::Address::XS' => '1.05';
requires 'Email::MIME' => '1.953';
requires 'Email::MIME::Creator' => '1.953';
requires 'Email::Sender' => '2.601';
requires 'Email::Valid' => '1.204';
requires 'Encode::Detect' => '1.01';
requires 'Exception::Class' => '1.37';
requires 'File::Slurp';
Expand All @@ -56,12 +56,12 @@ requires 'JSON' => '2.61';
requires 'JSON::XS' => '2.34';
requires 'List::AllUtils' => '0.03';
requires 'List::UtilsBy' => '0.09';
requires 'Locale::Messages' => '1.23';
requires 'Locale::Messages' => '1.33';
requires 'Log::Dispatch' => '2.41';
requires 'LWP::Protocol::https' => '6.04';
requires 'Math::Random::Secure' => '0.06';
requires 'Method::Signatures::Simple' => '1.07';
requires 'MIME::Base64' => '3.13';
requires 'MIME::Base64' => '3.16';
requires 'Module::Pluggable' => '5.1';
requires 'Moose' => '2.1600';
requires 'MooseX::Clone' => '0.05';
Expand Down Expand Up @@ -95,7 +95,7 @@ requires 'Text::Trim' => '1.02';
requires 'Text::Unaccent::PurePerl' => '0.05';
requires 'Text::WikiFormat' => '0.81';
requires 'Throwable' => '0.200009';
requires 'Unicode::ICU::Collator' => '0.002';
requires 'Unicode::ICU::Collator' => '0.005';
requires 'URI' => '1.69';
requires 'XML::LibXML' => '1.70';
requires 'XML::Parser::Lite' => '0.719';
Expand Down