summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--buildfct33
-rwxr-xr-xgetmock18
-rwxr-xr-xmockit14
3 files changed, 56 insertions, 9 deletions
diff --git a/buildfct b/buildfct
index 331a12b..f9b5468 100644
--- a/buildfct
+++ b/buildfct
@@ -90,6 +90,7 @@ alias mockfc38xscl80=" mock --configdir=$mocketc -r fc38xscl80
alias mockfc38xscl81=" mock --configdir=$mocketc -r fc38xscl81 rebuild "
alias mockfc38xscl82=" mock --configdir=$mocketc -r fc38xscl82 rebuild "
alias mockfc38xscl83=" mock --configdir=$mocketc -r fc38xscl83 rebuild "
+alias mockfc38xscl84=" mock --configdir=$mocketc -r fc38xscl84 rebuild "
alias mockfc38xr60=" mock --configdir=$mocketc -r fc38xr60 rebuild "
alias mockfc38xr62=" mock --configdir=$mocketc -r fc38xr62 rebuild "
alias mockfc38xr70=" mock --configdir=$mocketc -r fc38xr70 rebuild "
@@ -107,6 +108,7 @@ alias mockfc39xscl80=" mock --configdir=$mocketc -r fc39xscl80
alias mockfc39xscl81=" mock --configdir=$mocketc -r fc39xscl81 rebuild "
alias mockfc39xscl82=" mock --configdir=$mocketc -r fc39xscl82 rebuild "
alias mockfc39xscl83=" mock --configdir=$mocketc -r fc39xscl83 rebuild "
+alias mockfc39xscl84=" mock --configdir=$mocketc -r fc39xscl84 rebuild "
alias mockfc39xr60=" mock --configdir=$mocketc -r fc39xr60 rebuild "
alias mockfc39xr62=" mock --configdir=$mocketc -r fc39xr62 rebuild "
alias mockfc39xr70=" mock --configdir=$mocketc -r fc39xr70 rebuild "
@@ -124,6 +126,7 @@ alias mockfc40xscl80=" mock --configdir=$mocketc -r fc40xscl80
alias mockfc40xscl81=" mock --configdir=$mocketc -r fc40xscl81 rebuild "
alias mockfc40xscl82=" mock --configdir=$mocketc -r fc40xscl82 rebuild "
alias mockfc40xscl83=" mock --configdir=$mocketc -r fc40xscl83 rebuild "
+alias mockfc40xscl84=" mock --configdir=$mocketc -r fc40xscl84 rebuild "
alias mockfc40xr60=" mock --configdir=$mocketc -r fc40xr60 rebuild "
alias mockfc40xr62=" mock --configdir=$mocketc -r fc40xr62 rebuild "
alias mockfc40xr70=" mock --configdir=$mocketc -r fc40xr70 rebuild "
@@ -205,6 +208,7 @@ alias mockel8xscl80=" mock --configdir=$mocketc -r el8xscl80 r
alias mockel8xscl81=" mock --configdir=$mocketc -r el8xscl81 rebuild "
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 mockel8xr60=" mock --configdir=$mocketc -r el8xr60 rebuild "
alias mockel8xr62=" mock --configdir=$mocketc -r el8xr62 rebuild "
alias mockel8xr70=" mock --configdir=$mocketc -r el8xr70 rebuild "
@@ -226,6 +230,7 @@ alias mockel9xscl80=" mock --configdir=$mocketc -r el9xscl80 r
alias mockel9xscl81=" mock --configdir=$mocketc -r el9xscl81 rebuild "
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 mockel9xr60=" mock --configdir=$mocketc -r el9xr60 rebuild "
alias mockel9xr62=" mock --configdir=$mocketc -r el9xr62 rebuild "
alias mockel9xr70=" mock --configdir=$mocketc -r el9xr70 rebuild "
@@ -445,7 +450,33 @@ else
fi
}
-# Build All distribution / version / 64bits for remi/scl-php82
+# Build All distribution / version / 64bits for remi/scl-php84
+mockscl84x()
+{
+quiet=""
+if [ "$1" = "-q" ]; then
+ quiet="--quiet"
+ shift
+fi
+
+if [ -f "$1" ]; then
+ for i in 39 38 40
+ do
+ echo -n "$(date +%X) scl84 fc$i "
+ mock $quiet --configdir=$mocketc -r fc${i}xscl84 rebuild "$@" && echo " Ok." || echo " Error !"
+ done
+ for i in 8 9
+ do
+ echo -n "$(date +%X) scl84 el$i "
+ mock $quiet --configdir=$mocketc -r el${i}xscl84 rebuild "$@" && echo " Ok." || echo " Error !"
+ done
+ date +%X
+else
+ echo "file not found '$1'"
+fi
+}
+
+# Build All distribution / version / 64bits for remi/scl-php83
mockscl83x()
{
quiet=""
diff --git a/getmock b/getmock
index c15986f..34aadb5 100755
--- a/getmock
+++ b/getmock
@@ -17,6 +17,9 @@ esac
rep=${2-remi}
case $dep in
+scl84el*) dep=${dep#scl84el}
+ type=enterprise
+ ;;
scl83el*) dep=${dep#scl83el}
type=enterprise
;;
@@ -219,6 +222,9 @@ el*) dep=${dep#el}
fc*) dep=${dep#fc}
type=fedora
;;
+scl84fc*) dep=${dep#scl84fc}
+ type=fedora
+ ;;
scl83fc*) dep=${dep#scl83fc}
type=fedora
;;
@@ -638,6 +644,16 @@ elif [ $1 = scl71 ]; then
getOneMock scl71el${i}x $opt
done
+elif [ $1 = scl84 ]; then
+ for i in fc38 fc39 fc40 el8 el9
+ do
+ getOneMock scl84${i}x $opt
+ done
+ getOneMock scl84fc39a $opt
+ getOneMock scl84fc40a $opt
+ getOneMock scl84el8a $opt
+ getOneMock scl84el9a $opt
+
elif [ $1 = scl83 ]; then
for i in fc38 fc39 fc40 el8 el9
do
@@ -721,7 +737,7 @@ elif [ $1 = scl72 ]; then
elif [ $1 = allphp ]; then
LOG=$(mktemp out.XXXXXXXXXX)
MOD="all72 all73 all74 all80 all81 all82 all83"
- SCL="scl56 scl70 scl71 scl72 scl73 scl74 scl80 scl81 scl82 scl83"
+ SCL="scl56 scl70 scl71 scl72 scl73 scl74 scl80 scl81 scl82 scl83 scl84"
for i in $SCL $MOD
do $0 $opt $i | tee $LOG
if grep -q '64\.rpm' $LOG && grep -q 'Aucun' $LOG
diff --git a/mockit b/mockit
index a5f6cbf..ca8ee24 100755
--- a/mockit
+++ b/mockit
@@ -35,9 +35,9 @@ fi
# Queue commands
if [ "$1" == "--list" ]; then
- echo "-- x86_64 queue --"
+ echo "-- x86_64 queue: $($REDISCLI scard mockx) tasks --"
$REDISCLI smembers mockx
- echo "-- aarch64 queue --"
+ echo "-- aarch64 queue: $($REDISCLI scard mocka) tasks --"
$REDISCLI smembers mocka
exit 0
elif [ "$1" == "--clean" ]; then
@@ -60,13 +60,13 @@ shift 2
# PHP version build range
if [ "$1" = "" ]; then
- MIN=0
+ MIN=56
else
MIN=$1
shift
fi
if [ "$1" = "" ]; then
- MAX=99
+ MAX=84
else
MAX=$1
shift
@@ -133,15 +133,15 @@ echo mockit $SRPM $DIST $MIN $MAX $@
case $DIST in
fc38x|fc39x|fc39a|fc40x|fc40a|el9x|el9a)
LST="82 81 74 80 83"
- SCL="74 80 81 82 83"
+ SCL="74 80 81 82 83 84"
;;
el8a)
LST="72 73 74 80 81 82 83"
- SCL="72 73 74 80 81 82 83"
+ SCL="72 73 74 80 81 82 83 84"
;;
el8x)
LST="72 73 74 80 81 82 83"
- SCL="56 70 71 72 73 74 80 81 82 83"
+ SCL="56 70 71 72 73 74 80 81 82 83 84"
;;
allx)
if [ $REDIS -ge 1 ]; then