From f1a26c1d9f098a8716015b58c8700c338a2b39ef Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 4 Nov 2025 13:43:21 +0100 Subject: add redis 8.4 helpers --- buildfct | 6 +++ getmock | 135 ++++++++++++++++++++++++++++++++++---------------------------- mkmodular | 48 ++++++++++++++++------ mockit | 32 +++++++++++---- 4 files changed, 142 insertions(+), 79 deletions(-) diff --git a/buildfct b/buildfct index 2850890..7aa9ea2 100644 --- a/buildfct +++ b/buildfct @@ -22,6 +22,7 @@ alias mockfc41xscl84=" mock --configdir=$mocketc -r fc41xscl84 alias mockfc41xscl85=" mock --configdir=$mocketc -r fc41xscl85 rebuild " alias mockfc41xr80=" mock --configdir=$mocketc -r fc41xr80 rebuild " alias mockfc41xr82=" mock --configdir=$mocketc -r fc41xr82 rebuild " +alias mockfc41xr84=" mock --configdir=$mocketc -r fc41xr84 rebuild " alias mockfc41xv81=" mock --configdir=$mocketc -r fc41xv81 rebuild " alias mockfc41xv90=" mock --configdir=$mocketc -r fc41xv90 rebuild " @@ -42,6 +43,7 @@ alias mockfc42xscl84=" mock --configdir=$mocketc -r fc42xscl84 alias mockfc42xscl85=" mock --configdir=$mocketc -r fc42xscl85 rebuild " alias mockfc42xr80=" mock --configdir=$mocketc -r fc42xr80 rebuild " alias mockfc42xr82=" mock --configdir=$mocketc -r fc42xr82 rebuild " +alias mockfc42xr84=" mock --configdir=$mocketc -r fc42xr84 rebuild " alias mockfc42xv81=" mock --configdir=$mocketc -r fc42xv81 rebuild " alias mockfc42xv90=" mock --configdir=$mocketc -r fc42xv90 rebuild " @@ -62,6 +64,7 @@ alias mockfc43xscl84=" mock --configdir=$mocketc -r fc43xscl84 alias mockfc43xscl85=" mock --configdir=$mocketc -r fc43xscl85 rebuild " alias mockfc43xr80=" mock --configdir=$mocketc -r fc43xr80 rebuild " alias mockfc43xr82=" mock --configdir=$mocketc -r fc43xr82 rebuild " +alias mockfc43xr84=" mock --configdir=$mocketc -r fc43xr84 rebuild " alias mockfc43xv81=" mock --configdir=$mocketc -r fc43xv81 rebuild " alias mockfc43xv90=" mock --configdir=$mocketc -r fc43xv90 rebuild " @@ -97,6 +100,7 @@ alias mockel8xr70=" mock --configdir=$mocketc -r el8xr70 r alias mockel8xr72=" mock --configdir=$mocketc -r el8xr72 rebuild " alias mockel8xr80=" mock --configdir=$mocketc -r el8xr80 rebuild " alias mockel8xr82=" mock --configdir=$mocketc -r el8xr82 rebuild " +alias mockel8xr84=" mock --configdir=$mocketc -r el8xr84 rebuild " alias mockel8xv81=" mock --configdir=$mocketc -r el8xv81 rebuild " alias mockel8xv90=" mock --configdir=$mocketc -r el8xv90 rebuild " ## alias mockel8xm=" mock --configdir=$mocketc -r el8xm rebuild " @@ -126,6 +130,7 @@ alias mockel9xr70=" mock --configdir=$mocketc -r el9xr70 r alias mockel9xr72=" mock --configdir=$mocketc -r el9xr72 rebuild " alias mockel9xr80=" mock --configdir=$mocketc -r el9xr80 rebuild " alias mockel9xr82=" mock --configdir=$mocketc -r el9xr82 rebuild " +alias mockel9xr84=" mock --configdir=$mocketc -r el9xr84 rebuild " alias mockel9xv81=" mock --configdir=$mocketc -r el9xv81 rebuild " alias mockel9xv90=" mock --configdir=$mocketc -r el9xv90 rebuild " alias mockel9xm=" mock --configdir=$mocketc -r el9xm rebuild " @@ -151,6 +156,7 @@ alias mockel10xscl85=" mock --configdir=$mocketc -r el10xscl85 alias mockel10xr72=" mock --configdir=$mocketc -r el10xr72 rebuild " alias mockel10xr80=" mock --configdir=$mocketc -r el10xr80 rebuild " alias mockel10xr82=" mock --configdir=$mocketc -r el10xr82 rebuild " +alias mockel10xr84=" mock --configdir=$mocketc -r el10xr84 rebuild " alias mockel10xv81=" mock --configdir=$mocketc -r el10xv81 rebuild " alias mockel10xv90=" mock --configdir=$mocketc -r el10xv90 rebuild " alias mockel10xm=" mock --configdir=$mocketc -r el10xm rebuild " diff --git a/getmock b/getmock index 949b3a8..9538e73 100755 --- a/getmock +++ b/getmock @@ -551,96 +551,96 @@ elif [ $1 = all74 ]; then [ $opt = test ] && opt=test74 getOneMock fc43x74 $opt '*module_php.7.4*' getOneMock fc43a74 $opt '*module_php.7.4*' - getOneMock fc42x74 $opt '*7.4*' - getOneMock fc42a74 $opt '*7.4*' - getOneMock fc41x74 $opt '*7.4*' - getOneMock fc41a74 $opt '*7.4*' - getOneMock el8x74 $opt '*7.4*' - getOneMock el8a74 $opt '*7.4*' - getOneMock el9x74 $opt '*7.4*' - getOneMock el9a74 $opt '*7.4*' - getOneMock el10x74 $opt '*7.4*' - getOneMock el10a74 $opt '*7.4*' + getOneMock fc42x74 $opt '*module_php.7.4*' + getOneMock fc42a74 $opt '*module_php.7.4*' + getOneMock fc41x74 $opt '*module_php.7.4*' + getOneMock fc41a74 $opt '*module_php.7.4*' + getOneMock el8x74 $opt '*module_php.7.4*' + getOneMock el8a74 $opt '*module_php.7.4*' + getOneMock el9x74 $opt '*module_php.7.4*' + getOneMock el9a74 $opt '*module_php.7.4*' + getOneMock el10x74 $opt '*module_php.7.4*' + getOneMock el10a74 $opt '*module_php.7.4*' elif [ $1 = all80 ]; then [ $opt = remi ] && opt=php80 [ $opt = test ] && opt=test80 getOneMock fc43x80 $opt '*module_php.8.0*' getOneMock fc43a80 $opt '*module_php.8.0*' - getOneMock fc42x80 $opt '*8.0*' - getOneMock fc42a80 $opt '*8.0*' - getOneMock fc41x80 $opt '*8.0*' - getOneMock fc41a80 $opt '*8.0*' - getOneMock el8x80 $opt '*8.0*' - getOneMock el8a80 $opt '*8.0*' - getOneMock el9x80 $opt '*8.0*' - getOneMock el9a80 $opt '*8.0*' - getOneMock el10x80 $opt '*8.0*' - getOneMock el10a80 $opt '*8.0*' + getOneMock fc42x80 $opt '*module_php.8.0*' + getOneMock fc42a80 $opt '*module_php.8.0*' + getOneMock fc41x80 $opt '*module_php.8.0*' + getOneMock fc41a80 $opt '*module_php.8.0*' + getOneMock el8x80 $opt '*module_php.8.0*' + getOneMock el8a80 $opt '*module_php.8.0*' + getOneMock el9x80 $opt '*module_php.8.0*' + getOneMock el9a80 $opt '*module_php.8.0*' + getOneMock el10x80 $opt '*module_php.8.0*' + getOneMock el10a80 $opt '*module_php.8.0*' elif [ $1 = all81 ]; then [ $opt = remi ] && opt=php81 [ $opt = test ] && opt=test81 getOneMock fc43x81 $opt '*module_php.8.1*' getOneMock fc43a81 $opt '*module_php.8.1*' - getOneMock fc42x81 $opt '*8.1*' - getOneMock fc42a81 $opt '*8.1*' - getOneMock fc41x81 $opt '*8.1*' - getOneMock fc41a81 $opt '*8.1*' - getOneMock el8x81 $opt '*8.1*' - getOneMock el8a81 $opt '*8.1*' - getOneMock el9x81 $opt '*8.1*' - getOneMock el9a81 $opt '*8.1*' - getOneMock el10x81 $opt '*8.1*' - getOneMock el10a81 $opt '*8.1*' + getOneMock fc42x81 $opt '*module_php.8.1*' + getOneMock fc42a81 $opt '*module_php.8.1*' + getOneMock fc41x81 $opt '*module_php.8.1*' + getOneMock fc41a81 $opt '*module_php.8.1*' + getOneMock el8x81 $opt '*module_php.8.1*' + getOneMock el8a81 $opt '*module_php.8.1*' + getOneMock el9x81 $opt '*module_php.8.1*' + getOneMock el9a81 $opt '*module_php.8.1*' + getOneMock el10x81 $opt '*module_php.8.1*' + getOneMock el10a81 $opt '*module_php.8.1*' elif [ $1 = all82 ]; then [ $opt = remi ] && opt=php82 [ $opt = test ] && opt=test82 getOneMock fc43x82 $opt '*module_php.8.2*' getOneMock fc43a82 $opt '*module_php.8.2*' - getOneMock fc42x82 $opt '*8.2*' - getOneMock fc42a82 $opt '*8.2*' - getOneMock fc41x82 $opt '*8.2*' - getOneMock fc41a82 $opt '*8.2*' - getOneMock el8x82 $opt '*8.2*' - getOneMock el8a82 $opt '*8.2*' - getOneMock el9x82 $opt '*8.2*' - getOneMock el9a82 $opt '*8.2*' - getOneMock el10x82 $opt '*8.2*' - getOneMock el10a82 $opt '*8.2*' + getOneMock fc42x82 $opt '*module_php.8.2*' + getOneMock fc42a82 $opt '*module_php.8.2*' + getOneMock fc41x82 $opt '*module_php.8.2*' + getOneMock fc41a82 $opt '*module_php.8.2*' + getOneMock el8x82 $opt '*module_php.8.2*' + getOneMock el8a82 $opt '*module_php.8.2*' + getOneMock el9x82 $opt '*module_php.8.2*' + getOneMock el9a82 $opt '*module_php.8.2*' + getOneMock el10x82 $opt '*module_php.8.2*' + getOneMock el10a82 $opt '*module_php.8.2*' elif [ $1 = all83 ]; then [ $opt = remi ] && opt=php83 [ $opt = test ] && opt=test83 getOneMock fc43x83 $opt '*module_php.8.3*' getOneMock fc43a83 $opt '*module_php.8.3*' - getOneMock fc42x83 $opt '*8.3*' - getOneMock fc42a83 $opt '*8.3*' - getOneMock fc41x83 $opt '*8.3*' - getOneMock fc41a83 $opt '*8.3*' - getOneMock el8x83 $opt '*8.3*' - getOneMock el8a83 $opt '*8.3*' - getOneMock el9x83 $opt '*8.3*' - getOneMock el9a83 $opt '*8.3*' - getOneMock el10x83 $opt '*8.3*' - getOneMock el10a83 $opt '*8.3*' + getOneMock fc42x83 $opt '*module_php.8.3*' + getOneMock fc42a83 $opt '*module_php.8.3*' + getOneMock fc41x83 $opt '*module_php.8.3*' + getOneMock fc41a83 $opt '*module_php.8.3*' + getOneMock el8x83 $opt '*module_php.8.3*' + getOneMock el8a83 $opt '*module_php.8.3*' + getOneMock el9x83 $opt '*module_php.8.3*' + getOneMock el9a83 $opt '*module_php.8.3*' + getOneMock el10x83 $opt '*module_php.8.3*' + getOneMock el10a83 $opt '*module_php.8.3*' elif [ $1 = all84 ]; then [ $opt = remi ] && opt=php84 [ $opt = test ] && opt=test84 getOneMock fc43x84 $opt '*module_php.8.4*' getOneMock fc43a84 $opt '*module_php.8.4*' - getOneMock fc42x84 $opt '*8.4*' - getOneMock fc42a84 $opt '*8.4*' - getOneMock fc41x84 $opt '*8.4*' - getOneMock fc41a84 $opt '*8.4*' - getOneMock el8x84 $opt '*8.4*' - getOneMock el8a84 $opt '*8.4*' - getOneMock el9x84 $opt '*8.4*' - getOneMock el9a84 $opt '*8.4*' - getOneMock el10x84 $opt '*8.4*' - getOneMock el10a84 $opt '*8.4*' + getOneMock fc42x84 $opt '*module_php.8.4*' + getOneMock fc42a84 $opt '*module_php.8.4*' + getOneMock fc41x84 $opt '*module_php.8.4*' + getOneMock fc41a84 $opt '*module_php.8.4*' + getOneMock el8x84 $opt '*module_php.8.4*' + getOneMock el8a84 $opt '*module_php.8.4*' + getOneMock el9x84 $opt '*module_php.8.4*' + getOneMock el9a84 $opt '*module_php.8.4*' + getOneMock el10x84 $opt '*module_php.8.4*' + getOneMock el10a84 $opt '*module_php.8.4*' elif [ $1 = all85 ]; then [ $opt = remi ] && opt=php85 @@ -718,6 +718,21 @@ elif [ $1 = allv81 ]; then getOneMock el10x $opt '*module_valkey.8.1*' getOneMock el10a $opt '*module_valkey.8.1*' +elif [ $1 = allr84 ]; then + opt=redis84 + getOneMock fc41x $opt '*module_redis.8.4*' + getOneMock fc41a $opt '*module_redis.8.4*' + getOneMock fc42x $opt '*module_redis.8.4*' + getOneMock fc42a $opt '*module_redis.8.4*' + getOneMock fc43x $opt '*module_redis.8.4*' + getOneMock fc43a $opt '*module_redis.8.4*' + getOneMock el8x $opt '*module_redis.8.4*' + getOneMock el8a $opt '*module_redis.8.4*' + getOneMock el9x $opt '*module_redis.8.4*' + getOneMock el9a $opt '*module_redis.8.4*' + getOneMock el10x $opt '*module_redis.8.4*' + getOneMock el10a $opt '*module_redis.8.4*' + elif [ $1 = allr82 ]; then opt=redis82 getOneMock fc41x $opt '*module_redis.8.2*' diff --git a/mkmodular b/mkmodular index 5e4fbad..d489eec 100755 --- a/mkmodular +++ b/mkmodular @@ -453,7 +453,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f41', $_SERVER['argv']) || in_array $mod .= genModule('fedora/41/redis80/x86_64',$dest, '*.rpm', '8.0', 'x86_64', $deps, $template_redis); $mod .= genModule('fedora/41/redis82/x86_64',$dest, '*.rpm', '8.2', 'x86_64', $deps, $template_redis); - $mod .= genDefaults('redis', false, ['remi-8.0', 'remi-8.2']); + $mod .= genModule('fedora/41/redis84/x86_64',$dest, '*.rpm', '8.4', 'x86_64', $deps, $template_redis); + $mod .= genDefaults('redis', false, ['remi-8.0', 'remi-8.2', 'remi-8.4']); $mod .= genModule('fedora/41/valkey81/x86_64',$dest,'*.rpm', '8.1', 'x86_64', $deps, $template_valkey); $mod .= genModule('fedora/41/valkey90/x86_64',$dest,'*.rpm', '9.0', 'x86_64', $deps, $template_valkey); @@ -475,6 +476,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f41', $_SERVER['argv']) || in_array $mod .= genModule('fedora/41/debug-php85/x86_64', $dest, '*.rpm', '8.5', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/41/debug-redis80/x86_64',$dest, '*.rpm', '8.0', 'x86_64', $deps, $template_redis); $mod .= genModule('fedora/41/debug-redis82/x86_64',$dest, '*.rpm', '8.2', 'x86_64', $deps, $template_redis); + $mod .= genModule('fedora/41/debug-redis84/x86_64',$dest, '*.rpm', '8.4', 'x86_64', $deps, $template_redis); $mod .= genModule('fedora/41/debug-valkey81/x86_64',$dest,'*.rpm', '8.1', 'x86_64', $deps, $template_valkey); $mod .= genModule('fedora/41/debug-valkey90/x86_64',$dest,'*.rpm', '9.0', 'x86_64', $deps, $template_valkey); createRepo($dest, $mod); @@ -529,7 +531,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f41', $_SERVER['argv']) || in_array $mod .= genModule('fedora/41/redis80/aarch64',$dest, '*.rpm', '8.0', 'aarch64', $deps, $template_redis); $mod .= genModule('fedora/41/redis82/aarch64',$dest, '*.rpm', '8.2', 'aarch64', $deps, $template_redis); - $mod .= genDefaults('redis', false, ['remi-8.0', 'remi-8.2']); + $mod .= genModule('fedora/41/redis84/aarch64',$dest, '*.rpm', '8.4', 'aarch64', $deps, $template_redis); + $mod .= genDefaults('redis', false, ['remi-8.0', 'remi-8.2', 'remi-8.4']); $mod .= genModule('fedora/41/valkey81/aarch64',$dest,'*.rpm', '8.1', 'aarch64', $deps, $template_valkey); $mod .= genModule('fedora/41/valkey90/aarch64',$dest,'*.rpm', '9.0', 'aarch64', $deps, $template_valkey); @@ -551,6 +554,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f41', $_SERVER['argv']) || in_array $mod .= genModule('fedora/41/debug-php85/aarch64', $dest, '*.rpm', '8.5', 'aarch64', $deps, $template_php); $mod .= genModule('fedora/41/debug-redis80/aarch64',$dest, '*.rpm', '8.0', 'aarch64', $deps, $template_redis); $mod .= genModule('fedora/41/debug-redis82/aarch64',$dest, '*.rpm', '8.2', 'aarch64', $deps, $template_redis); + $mod .= genModule('fedora/41/debug-redis84/aarch64',$dest, '*.rpm', '8.4', 'aarch64', $deps, $template_redis); $mod .= genModule('fedora/41/debug-valkey81/aarch64',$dest,'*.rpm', '8.1', 'aarch64', $deps, $template_valkey); $mod .= genModule('fedora/41/debug-valkey90/aarch64',$dest,'*.rpm', '9.0', 'aarch64', $deps, $template_valkey); createRepo($dest, $mod); @@ -606,7 +610,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f42', $_SERVER['argv']) || in_array $mod .= genModule('fedora/42/redis80/x86_64',$dest, '*.rpm', '8.0', 'x86_64', $deps, $template_redis); $mod .= genModule('fedora/42/redis82/x86_64',$dest, '*.rpm', '8.2', 'x86_64', $deps, $template_redis); - $mod .= genDefaults('redis', false, ['remi-8.0', 'remi-8.2']); + $mod .= genModule('fedora/42/redis84/x86_64',$dest, '*.rpm', '8.4', 'x86_64', $deps, $template_redis); + $mod .= genDefaults('redis', false, ['remi-8.0', 'remi-8.2', 'remi-8.4']); $mod .= genModule('fedora/42/valkey81/x86_64',$dest, '*.rpm', '8.1', 'x86_64', $deps, $template_valkey); $mod .= genModule('fedora/42/valkey90/x86_64',$dest, '*.rpm', '9.0', 'x86_64', $deps, $template_valkey); @@ -628,6 +633,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f42', $_SERVER['argv']) || in_array $mod .= genModule('fedora/42/debug-php85/x86_64', $dest, '*.rpm', '8.5', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/42/debug-redis80/x86_64',$dest, '*.rpm', '8.0', 'x86_64', $deps, $template_redis); $mod .= genModule('fedora/42/debug-redis82/x86_64',$dest, '*.rpm', '8.2', 'x86_64', $deps, $template_redis); + $mod .= genModule('fedora/42/debug-redis84/x86_64',$dest, '*.rpm', '8.4', 'x86_64', $deps, $template_redis); $mod .= genModule('fedora/42/debug-valkey81/x86_64',$dest,'*.rpm', '8.1', 'x86_64', $deps, $template_valkey); $mod .= genModule('fedora/42/debug-valkey90/x86_64',$dest,'*.rpm', '9.0', 'x86_64', $deps, $template_valkey); createRepo($dest, $mod); @@ -682,7 +688,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f42', $_SERVER['argv']) || in_array $mod .= genModule('fedora/42/redis80/aarch64',$dest, '*.rpm', '8.0', 'aarch64', $deps, $template_redis); $mod .= genModule('fedora/42/redis82/aarch64',$dest, '*.rpm', '8.2', 'aarch64', $deps, $template_redis); - $mod .= genDefaults('redis', false, ['remi-8.0', 'remi-8.2']); + $mod .= genModule('fedora/42/redis84/aarch64',$dest, '*.rpm', '8.4', 'aarch64', $deps, $template_redis); + $mod .= genDefaults('redis', false, ['remi-8.0', 'remi-8.2', 'remi-8.4']); $mod .= genModule('fedora/42/valkey81/aarch64',$dest,'*.rpm', '8.1', 'aarch64', $deps, $template_valkey); $mod .= genModule('fedora/42/valkey90/aarch64',$dest,'*.rpm', '9.0', 'aarch64', $deps, $template_valkey); @@ -704,6 +711,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f42', $_SERVER['argv']) || in_array $mod .= genModule('fedora/42/debug-php85/aarch64', $dest, '*.rpm', '8.5', 'aarch64', $deps, $template_php); $mod .= genModule('fedora/42/debug-redis80/aarch64',$dest, '*.rpm', '8.0', 'aarch64', $deps, $template_redis); $mod .= genModule('fedora/42/debug-redis82/aarch64',$dest, '*.rpm', '8.2', 'aarch64', $deps, $template_redis); + $mod .= genModule('fedora/42/debug-redis84/aarch64',$dest, '*.rpm', '8.4', 'aarch64', $deps, $template_redis); $mod .= genModule('fedora/42/debug-valkey81/aarch64',$dest,'*.rpm', '8.1', 'aarch64', $deps, $template_valkey); $mod .= genModule('fedora/42/debug-valkey90/aarch64',$dest,'*.rpm', '9.0', 'aarch64', $deps, $template_valkey); createRepo($dest, $mod); @@ -759,7 +767,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f43', $_SERVER['argv']) || in_array $mod .= genModule('fedora/43/redis80/x86_64',$dest, '*.rpm', '8.0', 'x86_64', $deps, $template_redis); $mod .= genModule('fedora/43/redis82/x86_64',$dest, '*.rpm', '8.2', 'x86_64', $deps, $template_redis); - $mod .= genDefaults('redis', false, ['remi-8.0', 'remi-8.2']); + $mod .= genModule('fedora/43/redis84/x86_64',$dest, '*.rpm', '8.4', 'x86_64', $deps, $template_redis); + $mod .= genDefaults('redis', false, ['remi-8.0', 'remi-8.2', 'remi-8.4']); $mod .= genModule('fedora/43/valkey81/x86_64',$dest, '*.rpm', '8.1', 'x86_64', $deps, $template_valkey); $mod .= genModule('fedora/43/valkey90/x86_64',$dest, '*.rpm', '9.0', 'x86_64', $deps, $template_valkey); @@ -781,6 +790,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f43', $_SERVER['argv']) || in_array $mod .= genModule('fedora/43/debug-php85/x86_64', $dest, '*.rpm', '8.5', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/43/debug-redis80/x86_64',$dest, '*.rpm', '8.0', 'x86_64', $deps, $template_redis); $mod .= genModule('fedora/43/debug-redis82/x86_64',$dest, '*.rpm', '8.2', 'x86_64', $deps, $template_redis); + $mod .= genModule('fedora/43/debug-redis84/x86_64',$dest, '*.rpm', '8.4', 'x86_64', $deps, $template_redis); $mod .= genModule('fedora/43/debug-valkey81/x86_64',$dest,'*.rpm', '8.1', 'x86_64', $deps, $template_valkey); $mod .= genModule('fedora/43/debug-valkey90/x86_64',$dest,'*.rpm', '9.0', 'x86_64', $deps, $template_valkey); createRepo($dest, $mod); @@ -835,7 +845,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f43', $_SERVER['argv']) || in_array $mod .= genModule('fedora/43/redis80/aarch64',$dest, '*.rpm', '8.0', 'aarch64', $deps, $template_redis); $mod .= genModule('fedora/43/redis82/aarch64',$dest, '*.rpm', '8.2', 'aarch64', $deps, $template_redis); - $mod .= genDefaults('redis', false, ['remi-8.0', 'remi-8.2']); + $mod .= genModule('fedora/43/redis84/aarch64',$dest, '*.rpm', '8.4', 'aarch64', $deps, $template_redis); + $mod .= genDefaults('redis', false, ['remi-8.0', 'remi-8.2', 'remi-8.4']); $mod .= genModule('fedora/43/valkey81/aarch64',$dest,'*.rpm', '8.1', 'aarch64', $deps, $template_valkey); $mod .= genModule('fedora/43/valkey90/aarch64',$dest,'*.rpm', '9.0', 'aarch64', $deps, $template_valkey); @@ -857,6 +868,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f43', $_SERVER['argv']) || in_array $mod .= genModule('fedora/43/debug-php85/aarch64', $dest, '*.rpm', '8.5', 'aarch64', $deps, $template_php); $mod .= genModule('fedora/43/debug-redis80/aarch64',$dest, '*.rpm', '8.0', 'aarch64', $deps, $template_redis); $mod .= genModule('fedora/43/debug-redis82/aarch64',$dest, '*.rpm', '8.2', 'aarch64', $deps, $template_redis); + $mod .= genModule('fedora/43/debug-redis84/aarch64',$dest, '*.rpm', '8.4', 'aarch64', $deps, $template_redis); $mod .= genModule('fedora/43/debug-valkey81/aarch64',$dest,'*.rpm', '8.1', 'aarch64', $deps, $template_valkey); $mod .= genModule('fedora/43/debug-valkey90/aarch64',$dest,'*.rpm', '9.0', 'aarch64', $deps, $template_valkey); createRepo($dest, $mod); @@ -960,7 +972,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array $mod .= genModule('enterprise/8/redis72/x86_64', $dest, 'redis*.rpm', '7.2', 'x86_64', $deps, $template_redis); $mod .= genModule('enterprise/8/redis80/x86_64', $dest, 'redis*.rpm', '8.0', 'x86_64', $deps, $template_redis); $mod .= genModule('enterprise/8/redis82/x86_64', $dest, 'redis*.rpm', '8.2', 'x86_64', $deps, $template_redis); - $mod .= genDefaults('redis', '5', ['remi-5.0', 'remi-6.0', 'remi-6.2', 'remi-7.0', 'remi-7.2', 'remi-8.0', 'remi-8.2']); + $mod .= genModule('enterprise/8/redis84/x86_64', $dest, 'redis*.rpm', '8.4', 'x86_64', $deps, $template_redis); + $mod .= genDefaults('redis', '5', ['remi-5.0', 'remi-6.0', 'remi-6.2', 'remi-7.0', 'remi-7.2', 'remi-8.0', 'remi-8.2', 'remi-8.4']); $mod .= genModule('enterprise/8/valkey81/x86_64',$dest, 'valke*.rpm', '8.1', 'x86_64', $deps, $template_valkey); $mod .= genModule('enterprise/8/valkey90/x86_64',$dest, 'valke*.rpm', '9.0', 'x86_64', $deps, $template_valkey); @@ -998,6 +1011,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array $mod .= genModule('enterprise/8/debug-redis72/x86_64', $dest, 'redis*.rpm', '7.2', 'x86_64', $deps, $template_redis); $mod .= genModule('enterprise/8/debug-redis80/x86_64', $dest, 'redis*.rpm', '8.0', 'x86_64', $deps, $template_redis); $mod .= genModule('enterprise/8/debug-redis82/x86_64', $dest, 'redis*.rpm', '8.2', 'x86_64', $deps, $template_redis); + $mod .= genModule('enterprise/8/debug-redis84/x86_64', $dest, 'redis*.rpm', '8.4', 'x86_64', $deps, $template_redis); $mod .= genModule('enterprise/8/debug-valkey81/x86_64',$dest, 'valke*.rpm', '8.1', 'x86_64', $deps, $template_valkey); $mod .= genModule('enterprise/8/debug-valkey90/x86_64',$dest, 'valke*.rpm', '9.0', 'x86_64', $deps, $template_valkey); createRepo($dest, $mod); @@ -1068,7 +1082,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array $mod .= genModule('enterprise/8/redis72/aarch64', $dest, 'redis*.rpm', '7.2', 'aarch64', $deps, $template_redis); $mod .= genModule('enterprise/8/redis80/aarch64', $dest, 'redis*.rpm', '8.0', 'aarch64', $deps, $template_redis); $mod .= genModule('enterprise/8/redis82/aarch64', $dest, 'redis*.rpm', '8.2', 'aarch64', $deps, $template_redis); - $mod .= genDefaults('redis', '5', ['remi-6.0', 'remi-6.2', 'remi-7.0', 'remi-7.2', 'remi-8.0', 'remi-8.2']); + $mod .= genModule('enterprise/8/redis84/aarch64', $dest, 'redis*.rpm', '8.4', 'aarch64', $deps, $template_redis); + $mod .= genDefaults('redis', '5', ['remi-6.0', 'remi-6.2', 'remi-7.0', 'remi-7.2', 'remi-8.0', 'remi-8.2', 'remi-8.4']); $mod .= genModule('enterprise/8/valkey81/aarch64',$dest, 'valke*.rpm', '8.1', 'aarch64', $deps, $template_valkey); $mod .= genModule('enterprise/8/valkey90/aarch64',$dest, 'valke*.rpm', '9.0', 'aarch64', $deps, $template_valkey); @@ -1105,6 +1120,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array $mod .= genModule('enterprise/8/debug-redis72/aarch64', $dest, 'redis*.rpm', '7.2', 'aarch64', $deps, $template_redis); $mod .= genModule('enterprise/8/debug-redis80/aarch64', $dest, 'redis*.rpm', '8.0', 'aarch64', $deps, $template_redis); $mod .= genModule('enterprise/8/debug-redis82/aarch64', $dest, 'redis*.rpm', '8.2', 'aarch64', $deps, $template_redis); + $mod .= genModule('enterprise/8/debug-redis84/aarch64', $dest, 'redis*.rpm', '8.4', 'aarch64', $deps, $template_redis); $mod .= genModule('enterprise/8/debug-valkey81/aarch64',$dest, 'valke*.rpm', '8.1', 'aarch64', $deps, $template_valkey); $mod .= genModule('enterprise/8/debug-valkey90/aarch64',$dest, 'valke*.rpm', '9.0', 'aarch64', $deps, $template_valkey); createRepo($dest, $mod); @@ -1169,7 +1185,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv']) $mod .= genModule('enterprise/9/redis72/x86_64', $dest, 'redis*.rpm', '7.2', 'x86_64', $deps, $template_redis); $mod .= genModule('enterprise/9/redis80/x86_64', $dest, 'redis*.rpm', '8.0', 'x86_64', $deps, $template_redis); $mod .= genModule('enterprise/9/redis82/x86_64', $dest, 'redis*.rpm', '8.2', 'x86_64', $deps, $template_redis); - $mod .= genDefaults('redis', false, ['remi-5.0', 'remi-6.0', 'remi-6.2', 'remi-7.0', 'remi-7.2', 'remi-8.0', 'remi-8.2']); + $mod .= genModule('enterprise/9/redis84/x86_64', $dest, 'redis*.rpm', '8.4', 'x86_64', $deps, $template_redis); + $mod .= genDefaults('redis', false, ['remi-5.0', 'remi-6.0', 'remi-6.2', 'remi-7.0', 'remi-7.2', 'remi-8.0', 'remi-8.2', 'remi-8.4']); $mod .= genModule('enterprise/9/valkey81/x86_64', $dest, 'valke*.rpm', '8.1', 'x86_64', $deps, $template_valkey); $mod .= genModule('enterprise/9/valkey90/x86_64', $dest, 'valke*.rpm', '9.0', 'x86_64', $deps, $template_valkey); @@ -1204,6 +1221,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])) { $mod .= genModule('enterprise/9/debug-redis72/x86_64', $dest, 'redis*.rpm', '7.2', 'x86_64', $deps, $template_redis); $mod .= genModule('enterprise/9/debug-redis80/x86_64', $dest, 'redis*.rpm', '8.0', 'x86_64', $deps, $template_redis); $mod .= genModule('enterprise/9/debug-redis82/x86_64', $dest, 'redis*.rpm', '8.2', 'x86_64', $deps, $template_redis); + $mod .= genModule('enterprise/9/debug-redis84/x86_64', $dest, 'redis*.rpm', '8.4', 'x86_64', $deps, $template_redis); $mod .= genModule('enterprise/9/debug-valkey81/x86_64',$dest, 'valke*.rpm', '8.1', 'x86_64', $deps, $template_valkey); $mod .= genModule('enterprise/9/debug-valkey90/x86_64',$dest, 'valke*.rpm', '9.0', 'x86_64', $deps, $template_valkey); @@ -1235,7 +1253,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv']) $mod .= genModule('enterprise/9/redis72/aarch64', $dest, 'redis*.rpm', '7.2', 'aarch64', $deps, $template_redis); $mod .= genModule('enterprise/9/redis80/aarch64', $dest, 'redis*.rpm', '8.0', 'aarch64', $deps, $template_redis); $mod .= genModule('enterprise/9/redis82/aarch64', $dest, 'redis*.rpm', '8.2', 'aarch64', $deps, $template_redis); - $mod .= genDefaults('redis', false, ['remi-6.2', 'remi-7.0', 'remi-7.2', 'remi-8.0', 'remi-8.2']); + $mod .= genModule('enterprise/9/redis84/aarch64', $dest, 'redis*.rpm', '8.4', 'aarch64', $deps, $template_redis); + $mod .= genDefaults('redis', false, ['remi-6.2', 'remi-7.0', 'remi-7.2', 'remi-8.0', 'remi-8.2', 'remi-8.4']); $mod .= genModule('enterprise/9/valkey81/aarch64',$dest, 'valke*.rpm', '8.1', 'aarch64', $deps, $template_valkey); $mod .= genModule('enterprise/9/valkey90/aarch64',$dest, 'valke*.rpm', '9.0', 'aarch64', $deps, $template_valkey); @@ -1270,6 +1289,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])) { $mod .= genModule('enterprise/9/debug-redis72/aarch64', $dest, 'redis*.rpm', '7.2', 'aarch64', $deps, $template_redis); $mod .= genModule('enterprise/9/debug-redis80/aarch64', $dest, 'redis*.rpm', '8.0', 'aarch64', $deps, $template_redis); $mod .= genModule('enterprise/9/debug-redis82/aarch64', $dest, 'redis*.rpm', '8.2', 'aarch64', $deps, $template_redis); + $mod .= genModule('enterprise/9/debug-redis84/aarch64', $dest, 'redis*.rpm', '8.4', 'aarch64', $deps, $template_redis); $mod .= genModule('enterprise/9/debug-valkey81/aarch64',$dest, 'valke*.rpm', '8.1', 'aarch64', $deps, $template_valkey); $mod .= genModule('enterprise/9/debug-valkey90/aarch64',$dest, 'valke*.rpm', '9.0', 'aarch64', $deps, $template_valkey); @@ -1367,7 +1387,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el10', $_SERVER['argv']) $mod .= genModule('enterprise/10/redis72/x86_64', $dest, 'redis*.rpm', '7.2', 'x86_64', $deps, $template_redis); $mod .= genModule('enterprise/10/redis80/x86_64', $dest, 'redis*.rpm', '8.0', 'x86_64', $deps, $template_redis); $mod .= genModule('enterprise/10/redis82/x86_64', $dest, 'redis*.rpm', '8.2', 'x86_64', $deps, $template_redis); - $mod .= genDefaults('redis', false, ['remi-7.2', 'remi-8.0', 'remi-8.2']); + $mod .= genModule('enterprise/10/redis84/x86_64', $dest, 'redis*.rpm', '8.4', 'x86_64', $deps, $template_redis); + $mod .= genDefaults('redis', false, ['remi-7.2', 'remi-8.0', 'remi-8.2', 'remi-8.4']); $mod .= genModule('enterprise/10/valkey81/x86_64',$dest, 'valke*.rpm', '8.1', 'x86_64', $deps, $template_valkey); $mod .= genModule('enterprise/10/valkey90/x86_64',$dest, 'valke*.rpm', '9.0', 'x86_64', $deps, $template_valkey); @@ -1403,6 +1424,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el10', $_SERVER['argv'])) { $mod .= genModule('enterprise/10/debug-redis72/x86_64', $dest, 'redis*.rpm', '7.2', 'x86_64', $deps, $template_redis); $mod .= genModule('enterprise/10/debug-redis80/x86_64', $dest, 'redis*.rpm', '8.0', 'x86_64', $deps, $template_redis); $mod .= genModule('enterprise/10/debug-redis82/x86_64', $dest, 'redis*.rpm', '8.2', 'x86_64', $deps, $template_redis); + $mod .= genModule('enterprise/10/debug-redis84/x86_64', $dest, 'redis*.rpm', '8.4', 'x86_64', $deps, $template_redis); $mod .= genModule('enterprise/10/debug-valkey81/x86_64',$dest, 'redis*.rpm', '8.1', 'x86_64', $deps, $template_valkey); $mod .= genModule('enterprise/10/debug-valkey90/x86_64',$dest, 'redis*.rpm', '9.0', 'x86_64', $deps, $template_valkey); @@ -1430,7 +1452,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el10', $_SERVER['argv']) $mod .= genModule('enterprise/10/redis72/aarch64', $dest, 'redis*.rpm', '7.2', 'aarch64', $deps, $template_redis); $mod .= genModule('enterprise/10/redis80/aarch64', $dest, 'redis*.rpm', '8.0', 'aarch64', $deps, $template_redis); $mod .= genModule('enterprise/10/redis82/aarch64', $dest, 'redis*.rpm', '8.2', 'aarch64', $deps, $template_redis); - $mod .= genDefaults('redis', false, ['remi-7.2', 'remi-8.0', 'remi-8.2']); + $mod .= genModule('enterprise/10/redis84/aarch64', $dest, 'redis*.rpm', '8.4', 'aarch64', $deps, $template_redis); + $mod .= genDefaults('redis', false, ['remi-7.2', 'remi-8.0', 'remi-8.2', 'remi-8.4']); $mod .= genModule('enterprise/10/valkey81/aarch64',$dest, 'valke*.rpm', '8.1', 'aarch64', $deps, $template_valkey); $mod .= genModule('enterprise/10/valkey90/aarch64',$dest, 'valke*.rpm', '9.0', 'aarch64', $deps, $template_valkey); @@ -1461,6 +1484,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el10', $_SERVER['argv'])) { $mod .= genModule('enterprise/10/debug-redis72/aarch64', $dest, 'redis*.rpm', '7.2', 'aarch64', $deps, $template_redis); $mod .= genModule('enterprise/10/debug-redis80/aarch64', $dest, 'redis*.rpm', '8.0', 'aarch64', $deps, $template_redis); $mod .= genModule('enterprise/10/debug-redis82/aarch64', $dest, 'redis*.rpm', '8.2', 'aarch64', $deps, $template_redis); + $mod .= genModule('enterprise/10/debug-redis84/aarch64', $dest, 'redis*.rpm', '8.4', 'aarch64', $deps, $template_redis); $mod .= genModule('enterprise/10/debug-valkey81/aarch64',$dest, 'valke*.rpm', '8.1', 'aarch64', $deps, $template_valkey); $mod .= genModule('enterprise/10/debug-valkey90/aarch64',$dest, 'valke*.rpm', '9.0', 'aarch64', $deps, $template_valkey); diff --git a/mockit b/mockit index df82fc4..b4a5023 100755 --- a/mockit +++ b/mockit @@ -12,8 +12,8 @@ if [ "$2" = "" ]; then echo -e "\tDistribution: el8a el8x el9a el9x el10a el10x fc41a fc41x fc42a fc42x fc43a fc43x" echo -e "\tPHP: all, zts" echo -e "\tMemcached: memcached" - echo -e "\tImageMagick: im6, im7" - echo -e "\tRedis: r60, r62, r70, r72, r80, r82" + echo -e "\tLibraries: im6, im7, vips" + echo -e "\tRedis: r60, r62, r70, r72, r80, r82, r84" echo -e "\tValkey: v81, v90\n" exit 0 fi @@ -97,13 +97,13 @@ else fi case $DIST in - *x|*xm|*xr|*xr62|*xr72|*xr80|*xr82|*xv81|*xv90) + *x|*xm|*xr|*xr62|*xr72|*xr80|*xr82|*xr84|*xv81|*xv90) if [ $SUF != x ]; then echo "Not an x86_64 builder" exit 1 fi ;; - *a|*am|*ar|*ar62|*ar72|*ar80|*ar82|*av81|*av90) + *a|*am|*ar|*ar62|*ar72|*ar80|*ar82|*ar84|*av81|*av90) if [ $SUF != a ]; then if [ $REDIS -ge 1 ]; then REMOTE=1 @@ -148,6 +148,9 @@ if [ $REMOTE -ge 1 ]; then SRPM=/home/remi/todo/$(basename $SRPM) fi +TARGET_IM6="el8xr el9x el8ar el9a" +TARGET_IM7="fc41x fc42x fc43x el8xr el9x el10x fc41a fc42a fc43a el8ar el9a el10a" + # PHP version matrix echo mockit $SRPM $DIST $MIN $MAX $@ case $DIST in @@ -197,7 +200,7 @@ case $DIST in ;; im6) if [ $REDIS -ge 1 ]; then - for i in el8xr el9x el8ar el9a + for i in $TARGET_IM6 do $0 --valkey --mock $SRPM $i $MIN $MAX $@ done @@ -207,7 +210,7 @@ case $DIST in ;; im7) if [ $REDIS -ge 1 ]; then - for i in fc41x fc42x fc43x el8xr el9x el10x fc41a fc42a fc43a el8ar el9a el10a + for i in $TARGET_IM7 do $0 --valkey --mock $SRPM $i $MIN $MAX $@ done @@ -215,6 +218,21 @@ case $DIST in echo Not supported for direct build fi ;; + vips) + if [ $REDIS -ge 1 ]; then + for i in $TARGET_IM6 + do + $0 --valkey --mock $SRPM $i $MIN $MAX --without heif --without im7 --with im6 + done + for i in $TARGET_IM7 + do + $0 --valkey --mock $SRPM $i $MIN $MAX --without heif --without im7 --with gm + $0 --valkey --mock $SRPM $i $MIN $MAX --with heif --with im7 + done + else + echo Not supported for direct build + fi + ;; v81|v90) if [ $REDIS -ge 1 ]; then for i in fc42x fc43x fc41x el8x el9x el10x fc41a fc42a fc43a el8a el9a el10a @@ -225,7 +243,7 @@ case $DIST in echo Not supported for direct build fi ;; - r80|r82) + r80|r82|r84) if [ $REDIS -ge 1 ]; then for i in fc42x fc41x fc43x el8x el9x el10x fc41a fc42a fc43a el8a el9a el10a do -- cgit