Skip to content

Commit

Permalink
Merge branch 'main' into issue-1884
Browse files Browse the repository at this point in the history
  • Loading branch information
ikedas authored Sep 1, 2024
2 parents d2edc75 + 5379b80 commit e4ed811
Show file tree
Hide file tree
Showing 237 changed files with 56,267 additions and 53,234 deletions.
12 changes: 8 additions & 4 deletions .github/workflows/make-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@ jobs:
fail-fast: false
matrix:
os:
- 'macos-latest'
- 'macos-13'
#- 'macos-latest'
- 'ubuntu-latest'
perl:
- '5'
- '5.34'
- '5.36'
#- '5.34'
- '5.32'
- '5.30'
#- '5.28'
Expand All @@ -31,7 +33,7 @@ jobs:
- '5.16'
name: Perl ${{ matrix.perl }} on ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install dependencies for Linux
if: runner.os == 'Linux'
run: |
Expand All @@ -41,12 +43,13 @@ jobs:
if: runner.os == 'macOS'
run: |
brew install automake
brew install openssl
brew install pkg-config
- name: Workaround for macOS
if: runner.os == 'macOS'
# For Crypt::SMIME
run: >
echo "PKG_CONFIG_PATH=/usr/local/opt/openssl/lib/pkgconfig"
echo "PKG_CONFIG_PATH=$(brew --prefix openssl)/lib/pkgconfig"
>> $GITHUB_ENV
- name: Set up Perl
uses: shogo82148/actions-setup-perl@v1
Expand All @@ -59,6 +62,7 @@ jobs:
--with-feature=Data::Password --with-feature=ldap
--with-feature=safe-unicode --with-feature=smime
--with-feature=soap --with-feature=sqlite
${{ startsWith(matrix.os, 'macos') && '--with-feature=macos' || '' }}
- name: Run tests
run: |
if [ "$(uname -s)" = "Linux" ]; then
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/submit-pr-for-release-notes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ on:

env:
GH_PR_BODY: 'This pull request is a workplace for editing release notes `NEWS.md`.'
GH_PR_LABEL: on going,ignore-for-release
GH_PR_LABEL: ready,ignore-for-release
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

jobs:
submit-pr-for-release-notes:
if: github.repository_owner == 'sympa-community'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Submit PR
run: >
gh pr create -H $GITHUB_REPOSITORY_OWNER:$GITHUB_REF_NAME
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/submit-pr-for-translation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ on:
env:
GH_PR_TITLE: Update translation
GH_PR_BODY: This pull request was automatically submitted.
GH_PR_LABEL: translation,on going,ignore-for-release
GH_PR_LABEL: translation,ready,ignore-for-release
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

jobs:
submit-pr-for-translation:
if: github.repository_owner == 'sympa-community'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Submit PR to update translation
run: >
gh pr create -H $GITHUB_REPOSITORY_OWNER:$GITHUB_REF_NAME
Expand Down
1 change: 1 addition & 0 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ check_SCRIPTS = \
t/Request_Handler_add+del.t \
t/Request_Handler_set.t \
t/Scenario.t \
t/Spindle_TransformIncoming.t \
t/Tools_Data.t \
t/Tools_File.t \
t/Tools_Password.t \
Expand Down
12 changes: 10 additions & 2 deletions cpanfile
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,9 @@ requires 'Text::LineFold', '>= 2018.012';
# Used to get time with sub-second precision
requires 'Time::HiRes', '>= 1.29';

# Used to get Unix time from local time
requires 'Time::Local', '>= 1.23';

# Used to create URI containing non URI-canonical characters.
# Note: '3.28' is the version included in URI-1.35.
requires 'URI::Escape', '>= 3.28';
Expand Down Expand Up @@ -192,7 +195,7 @@ recommends 'Net::SMTP';
# Note: Perl 5.10.1 bundles 1.03 (per Unicode 5.1.0).
recommends 'Unicode::Normalize', '>= 1.03';

recommends 'Unicode::UTF8', '>= 0.58';
recommends 'Unicode::UTF8', '>= 0.60';

### Features
##
Expand Down Expand Up @@ -265,6 +268,11 @@ feature 'Encode::Locale', 'Useful when running command line utilities in the con
requires 'Encode::Locale', '>= 1.02';
};

feature 'macos', 'Requirements specific to macOS.' => sub {
# Use dlopen() for macOS Big Sur or later.
requires 'ExtUtils::MakeMaker', '>= 7.58';
};

feature 'remote-list-including', 'Required when including members of a remote list.' => sub {
requires 'LWP::Protocol::https';
};
Expand Down Expand Up @@ -319,7 +327,7 @@ feature 'safe-unicode', 'Sanitizes inputs with Unicode text.' => sub {
# Note: Perl 5.8.1 bundles version 0.23.
# Note: Perl 5.10.1 bundles 1.03 (per Unicode 5.1.0).
requires 'Unicode::Normalize', '>= 1.03';
requires 'Unicode::UTF8', '>= 0.58';
requires 'Unicode::UTF8', '>= 0.60';
};

on 'test' => sub {
Expand Down
1 change: 0 additions & 1 deletion default/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ nobase_nodist_default_DATA = \
nobase_default_DATA = \
auth.conf \
charset.conf \
crawlers_detection.conf \
create_list.conf \
edit_list.conf \
ldap_alias_entry.tt2 \
Expand Down
Loading

0 comments on commit e4ed811

Please sign in to comment.