Skip to content

Commit da8e352

Browse files
authored
Merge pull request #447 from zonemaster/develop
Merge develop branch into master (CLI)
2 parents 5f237ba + 52d053a commit da8e352

File tree

17 files changed

+1146
-408
lines changed

17 files changed

+1146
-408
lines changed

.github/workflows/ci.yml

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
---
2+
name: CI
3+
4+
on:
5+
push:
6+
branches:
7+
- develop
8+
- master
9+
- 'release/**'
10+
pull_request:
11+
branches:
12+
- develop
13+
- master
14+
- 'release/**'
15+
16+
jobs:
17+
run-tests:
18+
strategy:
19+
matrix:
20+
compatibility:
21+
- develop
22+
# - latest
23+
perl:
24+
- '5.40'
25+
- '5.36'
26+
- '5.26'
27+
runner:
28+
- ubuntu-22.04
29+
30+
runs-on: ${{ matrix.runner }}
31+
32+
steps:
33+
- uses: actions/checkout@v2
34+
35+
- uses: shogo82148/actions-setup-perl@v1
36+
with:
37+
perl-version: ${{ matrix.perl }}
38+
39+
- name: Install binary dependencies
40+
run: |
41+
# * These were taken from the installation instruction.
42+
# * Gettext was added so we can run cpanm . on the Engine sources.
43+
# * The Perl modules were left out because I couldn't get all of them
44+
# to work with custom Perl versions.
45+
# * Cpanminus was left out because actions-setup-perl installs it.
46+
sudo apt-get install -y \
47+
autoconf \
48+
automake \
49+
build-essential \
50+
gettext \
51+
libidn2-dev \
52+
libssl-dev \
53+
libtool \
54+
m4 \
55+
56+
- name: Install Zonemaster dependencies (latest)
57+
if: ${{ matrix.compatibility == 'latest' }}
58+
run: |
59+
cpanm --sudo --notest \
60+
Module::Install \
61+
ExtUtils::PkgConfig \
62+
Zonemaster::Engine
63+
64+
- name: Install Zonemaster dependencies (develop)
65+
if: ${{ matrix.compatibility == 'develop' }}
66+
run: |
67+
cpanm --sudo --notest \
68+
Devel::CheckLib \
69+
Module::Install \
70+
ExtUtils::PkgConfig \
71+
Module::Install::XSUtil
72+
git clone --branch=develop --depth=1 \
73+
https://github.com/zonemaster/zonemaster-ldns.git
74+
perl Makefile.PL # Generate MYMETA.yml to appease cpanm .
75+
( cd zonemaster-ldns ; cpanm --sudo --notest . )
76+
rm -rf zonemaster-ldns
77+
git clone --branch=develop --depth=1 \
78+
https://github.com/zonemaster/zonemaster-engine.git
79+
perl Makefile.PL # Generate MYMETA.yml to appease cpanm .
80+
( cd zonemaster-engine ; cpanm --sudo --notest . )
81+
rm -rf zonemaster-engine
82+
83+
# Installing Zonemaster::Engine requires root privileges, because of a
84+
# bug in Mail::SPF preventing normal installation with cpanm as
85+
# non-root user (see link below [1]).
86+
#
87+
# The alternative, if one still wishes to install Zonemaster::Engine
88+
# as non-root user, is to install Mail::SPF first with a command like:
89+
#
90+
# % cpanm --notest \
91+
# --install-args="--install_path sbin=$HOME/.local/sbin" \
92+
# Mail::SPF
93+
#
94+
# For the sake of consistency, other Perl packages installed from CPAN
95+
# are also installed as root.
96+
#
97+
# [1]: https://rt.cpan.org/Public/Bug/Display.html?id=34768
98+
- name: Install remaining dependencies
99+
run: |
100+
cpanm --sudo --verbose --notest --installdeps .
101+
102+
- name: Install Zonemaster::CLI
103+
run: |
104+
cpanm --sudo --verbose --notest .
105+
106+
- name: Show content of log files
107+
if: ${{ failure() }}
108+
run: cat /home/runner/.cpanm/work/*/build.log
109+
110+
- name: Test
111+
run: |
112+
prove -lv t

.travis.yml

Lines changed: 0 additions & 73 deletions
This file was deleted.

Changes

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
11
Release history for Zonemaster component Zonemaster-CLI
22

33

4+
v8.0.0 2025-06-26 (part of Zonemaster v2025.1 release)
5+
6+
[Breaking changes]
7+
- Makes the --test option more flexible #359
8+
9+
[Features]
10+
- Expands the --nstimes option #421
11+
- Expands the --count option #424
12+
13+
[Fixes]
14+
- Updates translations #444, #445
15+
- Slows down the spinner a bit #419
16+
17+
418
v7.2.0 2025-03-04 (part of Zonemaster v2024.2.1 release)
519

620
[Release information]

MANIFEST

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ inc/Module/Install/Share.pm
1212
inc/Module/Install/Win32.pm
1313
inc/Module/Install/WriteAll.pm
1414
lib/Zonemaster/CLI.pm
15+
lib/Zonemaster/CLI/TestCaseSet.pm
1516
LICENSE
1617
Makefile.PL
1718
MANIFEST This list of files
@@ -29,6 +30,7 @@ share/locale/sl/LC_MESSAGES/Zonemaster-CLI.mo
2930
share/locale/sv/LC_MESSAGES/Zonemaster-CLI.mo
3031
t/00-load.t
3132
t/pod.t
33+
t/test_case_set.t
3234
t/usage.fake-data.data
3335
t/usage.fake-root.data
3436
t/usage.hints

Makefile.PL

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ requires(
2323
'JSON::XS' => 0,
2424
'Locale::TextDomain' => 1.23,
2525
'Try::Tiny' => 0,
26-
'Zonemaster::LDNS' => 4.001000, # v4.1.0
27-
'Zonemaster::Engine' => 7.001000, # v7.1.0
26+
'Zonemaster::LDNS' => 5.000000, # v5.0.0
27+
'Zonemaster::Engine' => 8.000000, # v8.0.0
2828
);
2929

3030
test_requires(

0 commit comments

Comments
 (0)