Skip to content

Commit

Permalink
Merge pull request #1158 from zonemaster/develop
Browse files Browse the repository at this point in the history
Merge develop into master (Backend)
  • Loading branch information
matsduf authored Mar 18, 2024
2 parents b811313 + 242469a commit 20bd8c3
Show file tree
Hide file tree
Showing 24 changed files with 1,572 additions and 208 deletions.
16 changes: 7 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
dist: focal
dist: jammy

language: perl

perl: "5.32"
perl: "5.36"

stages:
- test
Expand All @@ -19,13 +19,10 @@ jobs:
- env: TARGET=PostgreSQL ZONEMASTER_RECORD=0 ZONEMASTER_BACKEND_CONFIG_FILE=./share/travis_postgresql_backend_config.ini
services: postgresql
# Cover supported Perl versions with SQLite
- perl: "5.30.2"
- perl: "5.30"
env: TARGET=SQLite ZONEMASTER_RECORD=0 ZONEMASTER_BACKEND_CONFIG_FILE=./share/travis_sqlite_backend_config.ini
- perl: "5.26"
env: TARGET=SQLite ZONEMASTER_RECORD=0 ZONEMASTER_BACKEND_CONFIG_FILE=./share/travis_sqlite_backend_config.ini
- perl: "5.16"
dist: bionic
env: TARGET=SQLite ZONEMASTER_RECORD=0 ZONEMASTER_BACKEND_CONFIG_FILE=./share/travis_sqlite_backend_config.ini

addons:
apt:
Expand All @@ -45,6 +42,7 @@ addons:
- liblist-moreutils-perl
- liblocale-msgfmt-perl
- libmail-rfc822-address-perl
- libmail-spf-perl
- libmodule-find-perl
- libnet-ip-xs-perl
- libpod-coverage-perl
Expand Down Expand Up @@ -116,9 +114,9 @@ before_install:
- mkdir -p ./lib/auto/share/dist/
- ln -s ../../../../share ./lib/auto/share/dist/Zonemaster-Backend

# Change default PostgreSQL 12 port to 5432
- if [[ "$TARGET" == "PostgreSQL" ]]; then sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/12/main/postgresql.conf; fi
- if [[ "$TARGET" == "PostgreSQL" ]]; then sudo pg_ctlcluster 12 main restart; fi
# Change default PostgreSQL 14 port to 5432
- if [[ "$TARGET" == "PostgreSQL" ]]; then sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/14/main/postgresql.conf; fi
- if [[ "$TARGET" == "PostgreSQL" ]]; then sudo pg_ctlcluster 14 main restart; fi

before_script:
- if [[ "$TARGET" == "PostgreSQL" ]]; then psql -U travis -c "CREATE USER travis_zonemaster WITH PASSWORD 'travis_zonemaster';"; fi
Expand Down
16 changes: 16 additions & 0 deletions Changes
Original file line number Diff line number Diff line change
@@ -1,6 +1,22 @@
Release history for Zonemaster component Zonemaster-Backend


v11.1.0 2024-03-18 (public release version)

[Release information]
- New database schema requires migration of existing database.

[Features]
- Migrates to new test results database table (#1092, #1145, #1147)
- Adds possibility to run several Test Agents on the same or multiple
servers to the same queue to increase capacity (#1121)
- Adds input name normalization (#1132)

[Fixes]
- Fixes FreeBSD testagent start script (#1146)
- Fixes a change in JSON::Validator code (#1109)


v11.0.2 2023-09-08 (public fix version)

[Fixes]
Expand Down
4 changes: 4 additions & 0 deletions MANIFEST
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ share/locale/nb/LC_MESSAGES/Zonemaster-Backend.mo
share/locale/sv/LC_MESSAGES/Zonemaster-Backend.mo
share/Makefile
share/patch/patch_db_zonemaster_backend_ver_9.0.0.pl
share/patch/patch_db_zonemaster_backend_ver_11.0.3.pl
share/patch/patch_mysql_db_zonemaster_backend_ver_1.0.3.pl
share/patch/patch_mysql_db_zonemaster_backend_ver_5.0.0.pl
share/patch/patch_mysql_db_zonemaster_backend_ver_5.0.2.pl
Expand All @@ -75,10 +76,13 @@ t/00-load.t
t/batches.t
t/config.t
t/db.t
t/db_ddl.t
t/idn.data
t/idn.t
t/lifecycle.t
t/parameters_validation.t
t/queue.t
t/rpc_validation.t
t/test01.data
t/test01.t
t/test_profile.json
Expand Down
4 changes: 2 additions & 2 deletions Makefile.PL
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ requires
'Router::Simple::Declare' => 0,
'Starman' => 0,
'Try::Tiny' => 0.12,
'Zonemaster::LDNS' => 3.002000, # v3.2.0
'Zonemaster::Engine' => 4.007003, # v4.7.3
'Zonemaster::LDNS' => 4.000000, # v4.0.0
'Zonemaster::Engine' => 5.000000, # v5.0.0
;

test_requires 'DBD::SQLite' => 1.4702;
Expand Down
2 changes: 1 addition & 1 deletion lib/Zonemaster/Backend.pm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package Zonemaster::Backend;

our $VERSION = '11.0.2';
our $VERSION = '11.1.0';

use strict;
use warnings;
Expand Down
Loading

0 comments on commit 20bd8c3

Please sign in to comment.