From 070cda579b3ba88a989dd84819dcd8b0f4c4f35c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 30 Aug 2023 13:27:41 +0200 Subject: php 8.3 as base helpers --- buildfct | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- getmock | 82 ++++++++++++++++++++++++++++++++++-------- mkmodular | 38 ++++++++++++++++---- mockit | 18 ++++++++-- 4 files changed, 234 insertions(+), 25 deletions(-) diff --git a/buildfct b/buildfct index 0831fcf..fb99bec 100644 --- a/buildfct +++ b/buildfct @@ -64,6 +64,7 @@ alias mockfc37x74=" mock --configdir=$mocketc -r fc37x74 alias mockfc37x80=" mock --configdir=$mocketc -r fc37x80 rebuild " alias mockfc37x81=" mock --configdir=$mocketc -r fc37x81 rebuild " alias mockfc37x82=" mock --configdir=$mocketc -r fc37x82 rebuild " +alias mockfc37x83=" mock --configdir=$mocketc -r fc37x83 rebuild " alias mockfc37xscl74=" mock --configdir=$mocketc -r fc37xscl74 rebuild " alias mockfc37xscl80=" mock --configdir=$mocketc -r fc37xscl80 rebuild " alias mockfc37xscl81=" mock --configdir=$mocketc -r fc37xscl81 rebuild " @@ -83,6 +84,7 @@ alias mockfc38x74=" mock --configdir=$mocketc -r fc38x74 alias mockfc38x80=" mock --configdir=$mocketc -r fc38x80 rebuild " alias mockfc38x81=" mock --configdir=$mocketc -r fc38x81 rebuild " alias mockfc38x82=" mock --configdir=$mocketc -r fc38x82 rebuild " +alias mockfc38x83=" mock --configdir=$mocketc -r fc38x83 rebuild " alias mockfc38xscl74=" mock --configdir=$mocketc -r fc38xscl74 rebuild " alias mockfc38xscl80=" mock --configdir=$mocketc -r fc38xscl80 rebuild " alias mockfc38xscl81=" mock --configdir=$mocketc -r fc38xscl81 rebuild " @@ -99,6 +101,7 @@ alias mockfc39x74=" mock --configdir=$mocketc -r fc39x74 alias mockfc39x80=" mock --configdir=$mocketc -r fc39x80 rebuild " alias mockfc39x81=" mock --configdir=$mocketc -r fc39x81 rebuild " alias mockfc39x82=" mock --configdir=$mocketc -r fc39x82 rebuild " +alias mockfc39x83=" mock --configdir=$mocketc -r fc39x83 rebuild " alias mockfc39xscl74=" mock --configdir=$mocketc -r fc39xscl74 rebuild " alias mockfc39xscl80=" mock --configdir=$mocketc -r fc39xscl80 rebuild " alias mockfc39xscl81=" mock --configdir=$mocketc -r fc39xscl81 rebuild " @@ -149,6 +152,7 @@ alias mockel7x74=" mock --configdir=$mocketc -r el7x74 r alias mockel7x80=" mock --configdir=$mocketc -r el7x80 rebuild " alias mockel7x81=" mock --configdir=$mocketc -r el7x81 rebuild " alias mockel7x82=" mock --configdir=$mocketc -r el7x82 rebuild " +alias mockel7x83=" mock --configdir=$mocketc -r el7x83 rebuild " alias mockel7xscl54=" mock --configdir=$mocketc -r el7xscl54 rebuild " alias mockel7xscl55=" mock --configdir=$mocketc -r el7xscl55 rebuild " alias mockel7xscl56=" mock --configdir=$mocketc -r el7xscl56 rebuild " @@ -172,6 +176,7 @@ alias mockel8x80=" mock --configdir=$mocketc -r el8x80 r alias mockel8x81=" mock --configdir=$mocketc -r el8x81 rebuild " alias mockel8n81=" mock --configdir=$mocketc -r el8n81 rebuild " alias mockel8x82=" mock --configdir=$mocketc -r el8x82 rebuild " +alias mockel8x83=" mock --configdir=$mocketc -r el8x83 rebuild " alias mockel8xscl56=" mock --configdir=$mocketc -r el8xscl56 rebuild " alias mockel8xscl70=" mock --configdir=$mocketc -r el8xscl70 rebuild " alias mockel8xscl71=" mock --configdir=$mocketc -r el8xscl71 rebuild " @@ -196,6 +201,7 @@ alias mockel9x80=" mock --configdir=$mocketc -r el9x80 r alias mockel9x81=" mock --configdir=$mocketc -r el9x81 rebuild " alias mockel9n81=" mock --configdir=$mocketc -r el9n81 rebuild " alias mockel9x82=" mock --configdir=$mocketc -r el9x82 rebuild " +alias mockel9x83=" mock --configdir=$mocketc -r el9x83 rebuild " alias mockel9xscl74=" mock --configdir=$mocketc -r el9xscl74 rebuild " alias mockel9xscl80=" mock --configdir=$mocketc -r el9xscl80 rebuild " alias mockel9xscl81=" mock --configdir=$mocketc -r el9xscl81 rebuild " @@ -309,7 +315,7 @@ fi if [ -f "$1" ]; then date +%X pids="" - for i in 38 37 + for i in 39 38 37 do echo -n "" (mock $quiet --configdir=$mocketc -r fc${i}x rebuild "$@" && echo "$(date +%X) (8x) fc$i Ok." || echo "fc$1 Error !")& @@ -342,6 +348,9 @@ fi if [ -f "$1" ]; then date +%X pids="" + echo -n "" + (mock $quiet --configdir=$mocketc -r fc39x rebuild "$@" && echo "$(date +%X) (82) fc39 Ok." || echo "fc38 Error !")& + pids="$pids $!" echo -n "" (mock $quiet --configdir=$mocketc -r fc38x rebuild "$@" && echo "$(date +%X) (82) fc38 Ok." || echo "fc38 Error !")& pids="$pids $!" @@ -563,6 +572,48 @@ else fi } +# Build All distribution / version / 64bits for remi/scl-php82 +mockscl83el() +{ +quiet="" +if [ "$1" = "-q" ]; then + quiet="--quiet" + shift +fi + +if [ -f "$1" ]; then + for i in 7 8 9 + do + echo -n "$(date +%X) scl83 el$i " + mock $quiet --configdir=$mocketc -r el${i}xscl83 rebuild "$@" && echo " Ok." || echo " Error !" + done + date +%X +else + echo "file not found '$1'" +fi +} + +# Build All distribution / version / 64bits for remi/scl-php82 +mockscl83fc() +{ +quiet="" +if [ "$1" = "-q" ]; then + quiet="--quiet" + shift +fi + +if [ -f "$1" ]; then + for i in 37 38 39 + do + echo -n "$(date +%X) scl83 fc$i " + mock $quiet --configdir=$mocketc -r fc${i}xscl83 rebuild "$@" && echo " Ok." || echo " Error !" + done + date +%X +else + echo "file not found '$1'" +fi +} + # Build All distribution / version / 64bits for remi/scl-php82 mockscl82x() { @@ -711,6 +762,74 @@ else fi } +# Build All distribution / version / 64bits for remi/remi-php83 +mock83x() +{ +quiet="" +if [ "$1" = "-q" ]; then + quiet="--quiet" + shift +fi + +if [ -f "$1" ]; then + for i in 37 38 39 + do + echo -n "$(date +%X) 83 fc$i " + mock $quiet --configdir=$mocketc -r fc${i}x83 rebuild "$@" && echo " Ok." || echo " Error !" + done + for i in 8 9 7 + do + echo -n "$(date +%X) 83 el$i " + mock $quiet --configdir=$mocketc -r el${i}x83 rebuild "$@"&& echo " Ok." || echo " Error !" + done + date +%X +else + echo "file not found '$1'" +fi +} + +# Build All distribution / version / 64bits for remi/remi-php83 +mock83el() +{ +quiet="" +if [ "$1" = "-q" ]; then + quiet="--quiet" + shift +fi + +if [ -f "$1" ]; then + for i in 8 9 7 + do + echo -n "$(date +%X) 83 el$i " + mock $quiet --configdir=$mocketc -r el${i}x83 rebuild "$@"&& echo " Ok." || echo " Error !" + done + date +%X +else + echo "file not found '$1'" +fi +} + +# Build All distribution / version / 64bits for remi/remi-php83 +mock83fc() +{ +quiet="" +if [ "$1" = "-q" ]; then + quiet="--quiet" + shift +fi + +if [ -f "$1" ]; then + for i in 37 38 39 + do + echo -n "$(date +%X) 83 fc$i " + mock $quiet --configdir=$mocketc -r fc${i}x83 rebuild "$@" && echo " Ok." || echo " Error !" + done + date +%X +else + echo "file not found '$1'" +fi +} + # Build All distribution / version / 64bits for remi/remi-php82 mock82x() { diff --git a/getmock b/getmock index a4fb7f2..fd5e7da 100755 --- a/getmock +++ b/getmock @@ -133,6 +133,16 @@ el??80) fi type=enterprise ;; +el??81) + dep=${1:2:1} + if [ "$2" == "php81" -o "$2" == "test81" ] + then rep=$rep + elif [ "$2" == "remi" ] + then rep=php81 + else rep=${2}81 + fi + type=enterprise + ;; el??82) dep=${1:2:1} if [ "$2" == "php82" -o "$2" == "test82" ] @@ -143,13 +153,13 @@ el??82) fi type=enterprise ;; -el??81) +el??83) dep=${1:2:1} - if [ "$2" == "php81" -o "$2" == "test81" ] + if [ "$2" == "php83" -o "$2" == "test83" ] then rep=$rep elif [ "$2" == "remi" ] - then rep=php81 - else rep=${2}81 + then rep=php83 + else rep=${2}83 fi type=enterprise ;; @@ -173,6 +183,16 @@ fc??x80) fi type=fedora ;; +fc??x81) + dep=${1:2:2} + if [ "$2" == "php81" -o "$2" == "test81" ] + then rep=$rep + elif [ "$2" == "remi" ] + then rep=php81 + else rep=${2}81 + fi + type=fedora + ;; fc??x82) dep=${1:2:2} if [ "$2" == "php82" -o "$2" == "test82" ] @@ -183,13 +203,13 @@ fc??x82) fi type=fedora ;; -fc??x81) +fc??x83) dep=${1:2:2} - if [ "$2" == "php81" -o "$2" == "test81" ] + if [ "$2" == "php83" -o "$2" == "test83" ] then rep=$rep elif [ "$2" == "remi" ] - then rep=php81 - else rep=${2}81 + then rep=php83 + else rep=${2}83 fi type=fedora ;; @@ -488,13 +508,45 @@ elif [ $1 = all82 ]; then getOneMock el9x82 $opt '*8.2*' getOneMock el9a82 $opt '*8.2*' +elif [ $1 = all83 ]; then + [ $opt = remi ] && opt=php83 + [ $opt = test ] && opt=test83 + getOneMock fc37x83 $opt '*8.3*' + getOneMock fc38x83 $opt '*8.3*' + getOneMock fc39x83 $opt '*8.3*' + getOneMock el7x83 $opt '*8.3*' + getOneMock el8x83 $opt '*8.3*' + getOneMock el9x83 $opt '*8.3*' + getOneMock el9a83 $opt '*8.3*' + +elif [ $1 = allfc39x ]; then + + getOneMock fc39x $opt + getOneMock scl74fc39x $opt + getOneMock scl80fc39x $opt + getOneMock scl81fc39x $opt + getOneMock scl82fc39x $opt + getOneMock scl83fc39x $opt + if [ $opt = test ]; then + getOneMock fc39x74 test74 '*7.4*' + getOneMock fc39x80 test80 '*7.4*' + getOneMock fc39x81 test81 '*7.4*' + getOneMock fc39x82 test82 '*7.4*' + getOneMock fc39x83 test83 '*7.4*' + else + getOneMock fc39x74 php74 '*7.4*' + getOneMock fc39x80 php80 '*8.0*' + getOneMock fc39x81 php81 '*8.1*' + getOneMock fc39x83 php83 '*8.2*' + fi + elif [ $1 = allr60 ]; then opt=remi getOneMock el7x $opt '*6.0*' opt=redis60 - getOneMock fc36x $opt '*6.0*' getOneMock fc37x $opt '*6.0*' getOneMock fc38x $opt '*6.0*' + getOneMock fc39x $opt '*6.0*' getOneMock el8x $opt '*6.0*' getOneMock el9x $opt '*6.0*' getOneMock el9a $opt '*6.0*' @@ -503,9 +555,9 @@ elif [ $1 = allr62 ]; then opt=remi getOneMock el7x $opt '*6.2*' opt=redis62 - getOneMock fc36x $opt '*6.2*' getOneMock fc37x $opt '*6.2*' getOneMock fc38x $opt '*6.2*' + getOneMock fc39x $opt '*6.2*' getOneMock el8x $opt '*6.2*' getOneMock el9x $opt '*6.2*' getOneMock el9a $opt '*6.2*' @@ -514,9 +566,9 @@ elif [ $1 = allr70 ]; then opt=remi getOneMock el7x $opt '*7.0*' opt=redis70 - getOneMock fc36x $opt '*7.0*' getOneMock fc37x $opt '*7.0*' getOneMock fc38x $opt '*7.0*' + getOneMock fc39x $opt '*7.0*' getOneMock el8x $opt '*7.0*' getOneMock el9x $opt '*7.0*' getOneMock el9a $opt '*7.0*' @@ -525,9 +577,9 @@ elif [ $1 = allr72 ]; then opt=remi getOneMock el7x $opt '*7.2*' opt=redis72 - getOneMock fc36x $opt '*7.2*' getOneMock fc37x $opt '*7.2*' getOneMock fc38x $opt '*7.2*' + getOneMock fc39x $opt '*7.2*' getOneMock el8x $opt '*7.2*' getOneMock el9x $opt '*7.2*' getOneMock el9a $opt '*7.2*' @@ -537,9 +589,9 @@ elif [ $1 = allm ]; then getOneMock el7x $opt '*1.6*' getOneMock el8x $opt '*1.6*' opt=memcached - getOneMock fc36x $opt '*1.6*' getOneMock fc37x $opt '*1.6*' getOneMock fc38x $opt '*1.6*' + getOneMock fc39x $opt '*1.6*' getOneMock el9x $opt '*1.6*' getOneMock el9a $opt '*1.6*' @@ -560,7 +612,7 @@ elif [ $1 = for55 ]; then done elif [ $1 = allx ]; then - for i in 36 37 38 + for i in 37 38 39 do getOneMock fc${i}x $opt done @@ -610,7 +662,7 @@ elif [ $1 = scl82 ]; then done elif [ $1 = scl83 ]; then - for i in fc37 fc38 39 el7 el8 el9 + for i in fc37 fc38 fc39 el7 el8 el9 do getOneMock scl83${i}x $opt done diff --git a/mkmodular b/mkmodular index 6247bb6..aa45ed1 100755 --- a/mkmodular +++ b/mkmodular @@ -582,7 +582,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f37', $_SERVER['argv'])) { $mod .= genModule('fedora/37/php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/37/php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/37/php82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); - $mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2']); + $mod .= genModule('fedora/37/php83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); + $mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3']); $mod .= genModule('fedora/37/redis60/x86_64',$dest, '*.rpm', '6.0', 'x86_64', $deps, $template_redis); $mod .= genModule('fedora/37/redis62/x86_64',$dest, '*.rpm', '6.2', 'x86_64', $deps, $template_redis); $mod .= genModule('fedora/37/redis70/x86_64',$dest, '*.rpm', '7.0', 'x86_64', $deps, $template_redis); @@ -602,6 +603,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f37', $_SERVER['argv'])) { $mod .= genModule('fedora/37/debug-php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/37/debug-php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/37/debug-php82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/37/debug-php83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/37/debug-redis60/x86_64',$dest, '*.rpm', '6.0', 'x86_64', $deps, $template_redis); $mod .= genModule('fedora/37/debug-redis62/x86_64',$dest, '*.rpm', '6.2', 'x86_64', $deps, $template_redis); $mod .= genModule('fedora/37/debug-redis70/x86_64',$dest, '*.rpm', '7.0', 'x86_64', $deps, $template_redis); @@ -620,6 +622,7 @@ if (in_array('f37', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $mod .= genModule('fedora/37/test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/37/test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/37/test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/37/test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); createRepo($dest, $mod); $dest = 'fedora/37/debug-modular-test/x86_64'; @@ -632,6 +635,7 @@ if (in_array('f37', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $mod .= genModule('fedora/37/debug-test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/37/debug-test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/37/debug-test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/37/debug-test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); createRepo($dest, $mod); } @@ -646,7 +650,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f38', $_SERVER['argv'])) { $mod .= genModule('fedora/38/php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/38/php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/38/php82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); - $mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2']); + $mod .= genModule('fedora/38/php83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); + $mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3']); $mod .= genModule('fedora/38/redis60/x86_64',$dest, '*.rpm', '6.0', 'x86_64', $deps, $template_redis); $mod .= genModule('fedora/38/redis62/x86_64',$dest, '*.rpm', '6.2', 'x86_64', $deps, $template_redis); $mod .= genModule('fedora/38/redis70/x86_64',$dest, '*.rpm', '7.0', 'x86_64', $deps, $template_redis); @@ -666,6 +671,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f38', $_SERVER['argv'])) { $mod .= genModule('fedora/38/debug-php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/38/debug-php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/38/debug-php82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/38/debug-php83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/38/debug-redis60/x86_64',$dest, '*.rpm', '6.0', 'x86_64', $deps, $template_redis); $mod .= genModule('fedora/38/debug-redis62/x86_64',$dest, '*.rpm', '6.2', 'x86_64', $deps, $template_redis); $mod .= genModule('fedora/38/debug-redis70/x86_64',$dest, '*.rpm', '7.0', 'x86_64', $deps, $template_redis); @@ -684,6 +690,7 @@ if (in_array('f38', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $mod .= genModule('fedora/38/test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/38/test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/38/test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/38/test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); createRepo($dest, $mod); $dest = 'fedora/38/debug-modular-test/x86_64'; @@ -696,6 +703,7 @@ if (in_array('f38', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $mod .= genModule('fedora/38/debug-test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/38/debug-test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/38/debug-test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/38/debug-test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); createRepo($dest, $mod); } @@ -710,7 +718,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f39', $_SERVER['argv'])) { $mod .= genModule('fedora/39/php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/39/php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/39/php82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); - $mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2']); + $mod .= genModule('fedora/39/php83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); + $mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3']); $mod .= genModule('fedora/39/redis60/x86_64',$dest, '*.rpm', '6.0', 'x86_64', $deps, $template_redis); $mod .= genModule('fedora/39/redis62/x86_64',$dest, '*.rpm', '6.2', 'x86_64', $deps, $template_redis); $mod .= genModule('fedora/39/redis70/x86_64',$dest, '*.rpm', '7.0', 'x86_64', $deps, $template_redis); @@ -730,6 +739,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f39', $_SERVER['argv'])) { $mod .= genModule('fedora/39/debug-php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/39/debug-php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/39/debug-php82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/39/debug-php83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/39/debug-redis60/x86_64',$dest, '*.rpm', '6.0', 'x86_64', $deps, $template_redis); $mod .= genModule('fedora/39/debug-redis62/x86_64',$dest, '*.rpm', '6.2', 'x86_64', $deps, $template_redis); $mod .= genModule('fedora/39/debug-redis70/x86_64',$dest, '*.rpm', '7.0', 'x86_64', $deps, $template_redis); @@ -748,6 +758,7 @@ if (in_array('f39', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $mod .= genModule('fedora/39/test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/39/test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/39/test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/39/test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); createRepo($dest, $mod); $dest = 'fedora/39/debug-modular-test/x86_64'; @@ -760,6 +771,7 @@ if (in_array('f39', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $mod .= genModule('fedora/39/debug-test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/39/debug-test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); $mod .= genModule('fedora/39/debug-test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); + $mod .= genModule('fedora/39/debug-test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); createRepo($dest, $mod); } @@ -776,6 +788,7 @@ if (in_array('el8', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $mod .= genModule('enterprise/8/test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/8/test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/8/test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); + $mod .= genModule('enterprise/8/test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); $deps = ['platform' => 'el8', 'php' => '']; $mod .= genModule('enterprise/8/composer2-test/x86_64', $dest, '*.rpm', '2', 'x86_64', $deps, $template_comp); @@ -793,6 +806,7 @@ if (in_array('el8', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $mod .= genModule('enterprise/8/debug-test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/8/debug-test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/8/debug-test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); + $mod .= genModule('enterprise/8/debug-test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); createRepo($dest, $mod); } if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) @@ -810,7 +824,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) $mod .= genModule('enterprise/8/php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/8/php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/8/php82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); - $mod .= genDefaults('php', '7.2', ['remi-7.2', 'remi-7.3', 'remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2']); + $mod .= genModule('enterprise/8/php83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); + $mod .= genDefaults('php', '7.2', ['remi-7.2', 'remi-7.3', 'remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3']); $deps = ['platform' => 'el8']; $mod .= genModule('enterprise/8/redis50/x86_64', $dest, 'redis*.rpm', '5.0', 'x86_64', $deps, $template_redis); @@ -840,6 +855,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) $mod .= genModule('enterprise/8/debug-php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/8/debug-php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/8/debug-php82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); + $mod .= genModule('enterprise/8/debug-php83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); $deps = ['platform' => 'el8']; $mod .= genModule('enterprise/8/debug-redis50/x86_64', $dest, 'redis*.rpm', '5.0', 'x86_64', $deps, $template_redis); @@ -861,6 +877,7 @@ if (in_array('el9', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $mod .= genModule('enterprise/9/test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/9/test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/9/test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); + $mod .= genModule('enterprise/9/test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); $deps = ['platform' => 'el9', 'php' => '']; $mod .= genModule('enterprise/9/composer2-test/x86_64', $dest, '*.rpm', '2', 'x86_64', $deps, $template_comp); @@ -876,6 +893,7 @@ if (in_array('el9', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $mod .= genModule('enterprise/9/debug-test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/9/debug-test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/9/debug-test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); + $mod .= genModule('enterprise/9/debug-test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); createRepo($dest, $mod); } @@ -891,7 +909,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv']) $mod .= genModule('enterprise/9/php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/9/php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/9/php82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); - $mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2']); + $mod .= genModule('enterprise/9/php83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); + $mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3']); $mod .= genModule('enterprise/9/redis50/x86_64', $dest, 'redis*.rpm', '5.0', 'x86_64', $deps, $template_redis); $mod .= genModule('enterprise/9/redis60/x86_64', $dest, 'redis*.rpm', '6.0', 'x86_64', $deps, $template_redis); @@ -918,6 +937,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])) { $mod .= genModule('enterprise/9/debug-php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/9/debug-php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/9/debug-php82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); + $mod .= genModule('enterprise/9/debug-php83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/9/debug-redis50/x86_64', $dest, 'redis*.rpm', '5.0', 'x86_64', $deps, $template_redis); $mod .= genModule('enterprise/9/debug-redis60/x86_64', $dest, 'redis*.rpm', '6.0', 'x86_64', $deps, $template_redis); @@ -941,7 +961,8 @@ if (count($_SERVER['argv']) > 1 && in_array('el9a', $_SERVER['argv']) $mod .= genModule('enterprise/9/php80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php); $mod .= genModule('enterprise/9/php81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); $mod .= genModule('enterprise/9/php82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); - $mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2']); + $mod .= genModule('enterprise/9/php83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php); + $mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3']); // $mod .= genModule('enterprise/9/redis50/aarch64', $dest, 'redis*.rpm', '5.0', 'aarch64', $deps, $template_redis); $mod .= genModule('enterprise/9/redis60/aarch64', $dest, 'redis*.rpm', '6.0', 'aarch64', $deps, $template_redis); @@ -968,6 +989,7 @@ if (count($_SERVER['argv']) > 1 && in_array('el9a', $_SERVER['argv'])) { $mod .= genModule('enterprise/9/debug-php80/aarch64', $dest, '*.rpm', '8.0', 'aarch64', $deps, $template_php); $mod .= genModule('enterprise/9/debug-php81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php); $mod .= genModule('enterprise/9/debug-php82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php); + $mod .= genModule('enterprise/9/debug-php83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php); // $mod .= genModule('enterprise/9/debug-redis50/aarch64', $dest, 'redis*.rpm', '5.0', 'aarch64', $deps, $template_redis); $mod .= genModule('enterprise/9/debug-redis60/aarch64', $dest, 'redis*.rpm', '6.0', 'aarch64', $deps, $template_redis); @@ -1009,6 +1031,7 @@ if (in_array('el7', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { $mod .= genModule('enterprise/7/test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/7/test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/7/test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); + $mod .= genModule('enterprise/7/test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); createRepo($dest, $mod); } if (count($_SERVER['argv']) < 2 || in_array('el7', $_SERVER['argv']) @@ -1026,7 +1049,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el7', $_SERVER['argv']) $mod .= genModule('enterprise/7/php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/7/php81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php); $mod .= genModule('enterprise/7/php82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php); - $mod .= genDefaults('php', '7.2', ['remi-7.1', 'remi-7.2', 'remi-7.3', 'remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2']); + $mod .= genModule('enterprise/7/php83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php); + $mod .= genDefaults('php', '7.2', ['remi-7.1', 'remi-7.2', 'remi-7.3', 'remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3']); $mod .= genModule('enterprise/7/remi/x86_64', $dest, 'redis*5.0*.rpm', '5.0', 'x86_64', $deps, $template_redis); $mod .= genModule('enterprise/7/remi/x86_64', $dest, 'redis*6.0*.rpm', '6.0', 'x86_64', $deps, $template_redis); diff --git a/mockit b/mockit index b1619da..d2a31dd 100755 --- a/mockit +++ b/mockit @@ -4,9 +4,23 @@ if [ "$2" = "" ]; then echo usage SRPM distro [ min_ver [, max_ver [, mock_options ]]] exit 0 fi + +BUILD_BASE=1 +BUILD_SCLS=1 + +if [ "$1" == "--nobase" -o "$1" == "--scl" ]; then + BUILD_BASE=0 + shift +fi +if [ "$1" == "--noscl" -o "$1" == "--base" ]; then + BUILD_SCLS=0 + shift +fi + SRPM=$1 DIST=$2 shift 2 + if [ "$1" = "" ]; then MIN=0 else @@ -50,14 +64,14 @@ case $DIST in ;; esac -for i in $LST +[ $BUILD_BASE -ge 1 ] && for i in $LST do if [ 0$i -ge $MIN -a 0$i -le $MAX ]; then echo -n "$(date +%X) $i " mock -q --configdir=$mocketc -r ${DIST}${i} rebuild $SRPM "$@" && echo " Ok." || echo " Error !" fi done -for i in $SCL +[ $BUILD_SCLS -ge 1 ] && for i in $SCL do if [ 0$i -ge $MIN -a 0$i -le $MAX ]; then echo -n "$(date +%X) scl$i " -- cgit