From 0fe754462d301287abbc75d29fee211406b14cdc Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 30 Jun 2025 14:59:21 +0200 Subject: php85 as SCL helpers --- buildfct | 31 +++++++++++++++++++++++++++++++ cleanoldrpm | 1 + mockit | 1 + 3 files changed, 33 insertions(+) diff --git a/buildfct b/buildfct index 7115b61..1a111ef 100644 --- a/buildfct +++ b/buildfct @@ -56,6 +56,7 @@ alias mockfc41xscl81=" mock --configdir=$mocketc -r fc41xscl81 alias mockfc41xscl82=" mock --configdir=$mocketc -r fc41xscl82 rebuild " alias mockfc41xscl83=" mock --configdir=$mocketc -r fc41xscl83 rebuild " alias mockfc41xscl84=" mock --configdir=$mocketc -r fc41xscl84 rebuild " +alias mockfc41xscl85=" mock --configdir=$mocketc -r fc41xscl85 rebuild " alias mockfc42x=" mock --configdir=$mocketc -r fc42x rebuild " alias mockfc42x74=" mock --configdir=$mocketc -r fc42x74 rebuild " @@ -70,6 +71,7 @@ alias mockfc42xscl81=" mock --configdir=$mocketc -r fc42xscl81 alias mockfc42xscl82=" mock --configdir=$mocketc -r fc42xscl82 rebuild " alias mockfc42xscl83=" mock --configdir=$mocketc -r fc42xscl83 rebuild " alias mockfc42xscl84=" mock --configdir=$mocketc -r fc42xscl84 rebuild " +alias mockfc42xscl85=" mock --configdir=$mocketc -r fc42xscl85 rebuild " alias mockel8x=" mock --configdir=$mocketc -r el8x rebuild " alias mockel8xr=" mock --configdir=$mocketc -r el8xr rebuild " @@ -95,6 +97,7 @@ alias mockel8xscl81=" mock --configdir=$mocketc -r el8xscl81 r alias mockel8xscl82=" mock --configdir=$mocketc -r el8xscl82 rebuild " alias mockel8xscl83=" mock --configdir=$mocketc -r el8xscl83 rebuild " alias mockel8xscl84=" mock --configdir=$mocketc -r el8xscl84 rebuild " +alias mockel8xscl85=" mock --configdir=$mocketc -r el8xscl85 rebuild " alias mockel8xr60=" mock --configdir=$mocketc -r el8xr60 rebuild " alias mockel8xr62=" mock --configdir=$mocketc -r el8xr62 rebuild " alias mockel8xr70=" mock --configdir=$mocketc -r el8xr70 rebuild " @@ -118,6 +121,7 @@ alias mockel9xscl81=" mock --configdir=$mocketc -r el9xscl81 r alias mockel9xscl82=" mock --configdir=$mocketc -r el9xscl82 rebuild " alias mockel9xscl83=" mock --configdir=$mocketc -r el9xscl83 rebuild " alias mockel9xscl84=" mock --configdir=$mocketc -r el9xscl84 rebuild " +alias mockel9xscl85=" mock --configdir=$mocketc -r el9xscl85 rebuild " alias mockel9xr60=" mock --configdir=$mocketc -r el9xr60 rebuild " alias mockel9xr62=" mock --configdir=$mocketc -r el9xr62 rebuild " alias mockel9xr70=" mock --configdir=$mocketc -r el9xr70 rebuild " @@ -140,6 +144,7 @@ alias mockel10xscl81=" mock --configdir=$mocketc -r el10xscl81 alias mockel10xscl82=" mock --configdir=$mocketc -r el10xscl82 rebuild " alias mockel10xscl83=" mock --configdir=$mocketc -r el10xscl83 rebuild " alias mockel10xscl84=" mock --configdir=$mocketc -r el10xscl84 rebuild " +alias mockel10xscl85=" mock --configdir=$mocketc -r el10xscl85 rebuild " alias mockel10xm=" mock --configdir=$mocketc -r el10xm rebuild " alias mockepel872=" mock --configdir=$mocketc -r epel872 rebuild " @@ -367,6 +372,32 @@ else fi } +# Build All distribution / version / 64bits for remi/scl-php84 +mockscl85x() +{ +quiet="" +if [ "$1" = "-q" ]; then + quiet="--quiet" + shift +fi + +if [ -f "$1" ]; then + for i in 42 41 + do + echo -n "$(date +%X) scl85 fc$i " + mock $quiet --configdir=$mocketc -r fc${i}xscl85 rebuild "$@" && echo " Ok." || echo " Error !" + done + for i in 8 9 10 + do + echo -n "$(date +%X) scl85 el$i " + mock $quiet --configdir=$mocketc -r el${i}xscl85 rebuild "$@" && echo " Ok." || echo " Error !" + done + date +%X +else + echo "file not found '$1'" +fi +} + # Build All distribution / version / 64bits for remi/scl-php84 mockscl84x() { diff --git a/cleanoldrpm b/cleanoldrpm index 50bd0f9..e4ee205 100755 --- a/cleanoldrpm +++ b/cleanoldrpm @@ -26,6 +26,7 @@ $multi = [ 'phan' => 1, // phan/3 'roundcubemail' => 4, // roundcubemail/1.x. 'remi-release' => 3, // remi-release/8.5 + 'php-pear-PHP-CodeSniffer' => 1, ]; if (isset($_SERVER['argv'][1])) { $keep = (int)$_SERVER['argv'][1]; diff --git a/mockit b/mockit index 38e388c..0af54ca 100755 --- a/mockit +++ b/mockit @@ -39,6 +39,7 @@ fi # Queue commands if [ "$1" == "--list" ]; then + a=$($REDISCLI bgsave) echo "-- x86_64 queue: $($REDISCLI scard mockx) tasks --" a=$($REDISCLI smembers mockx) [ -n "$a" ] && $REDISCLI smembers mockx | \ -- cgit