summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-11-24 11:53:34 +0100
committerRemi Collet <remi@php.net>2021-11-24 11:53:34 +0100
commit287c55841847b3f570f27bd4f5147d653ff6a7df (patch)
tree134c5e9f51e522335ddde255c9871424b1dfb032
parentb0ecab6fd22e2e4554b9bbac0137b132368eef18 (diff)
also use php version specific buildroot on EL7
-rw-r--r--buildfct12
-rwxr-xr-xgetmock100
2 files changed, 61 insertions, 51 deletions
diff --git a/buildfct b/buildfct
index 9f2e188..9658bfd 100644
--- a/buildfct
+++ b/buildfct
@@ -155,7 +155,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 33 34 35
+ for i in 35 33 34
do
echo -n "$(date +%X) fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x rebuild "$@" && echo " Ok." || echo " Error !"
@@ -181,7 +181,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 34 33 35
+ for i in 35 34 33
do
echo -n "$(date +%X) fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xr rebuild "$@" && echo " Ok." || echo " Error !"
@@ -207,7 +207,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 33 35 34
+ for i in 35 34 33
do
echo -n "$(date +%X) fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x rebuild "$@" && echo " Ok." || echo " Error !"
@@ -474,7 +474,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 33 34 35
+ for i in 35 33 34
do
echo -n "$(date +%X) scl81 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl81 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -500,7 +500,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 33 35 34
+ for i in 35 33 34
do
echo -n "$(date +%X) 81 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x81 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -578,7 +578,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 33 34 35
+ for i in 35 33 34
do
echo -n "$(date +%X) scl74 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl74 rebuild "$@" && echo " Ok." || echo " Error !"
diff --git a/getmock b/getmock
index 55fe9ed..05c532a 100755
--- a/getmock
+++ b/getmock
@@ -45,48 +45,68 @@ scl55el*) dep=${dep#scl55el}
scl54el*) dep=${dep#scl54el}
type=enterprise
;;
-el8x72)
- dep=8
- if [ "$2" == "php72" -o "$2" == "test72" ]
+el?x55)
+ dep=${1:2:1}
+ if [ "$2" == "php55" -o "$2" == "test55" ]
then rep=$rep
elif [ "$2" == "remi" ]
- then rep=php72
- else rep=${2}72
+ then rep=php55
+ else rep=${2}55
fi
type=enterprise
;;
-el8x73)
- dep=8
- if [ "$2" == "php73" -o "$2" == "test73" ]
+el?x56)
+ dep=${1:2:1}
+ if [ "$2" == "php56" -o "$2" == "test56" ]
then rep=$rep
elif [ "$2" == "remi" ]
- then rep=php73
- else rep=${2}73
+ then rep=php56
+ else rep=${2}56
fi
type=enterprise
;;
-el8x74)
- dep=8
- if [ "$2" == "php74" -o "$2" == "test74" ]
+el?x70)
+ dep=${1:2:1}
+ if [ "$2" == "php70" -o "$2" == "test70" ]
then rep=$rep
elif [ "$2" == "remi" ]
- then rep=php74
- else rep=${2}74
+ then rep=php70
+ else rep=${2}70
fi
type=enterprise
;;
-el8x80)
- dep=8
- if [ "$2" == "php80" -o "$2" == "test80" ]
+el?x71)
+ dep=${1:2:1}
+ if [ "$2" == "php71" -o "$2" == "test71" ]
then rep=$rep
elif [ "$2" == "remi" ]
- then rep=php80
- else rep=${2}80
+ then rep=php71
+ else rep=${2}71
+ fi
+ type=enterprise
+ ;;
+el?x72)
+ dep=${1:2:1}
+ if [ "$2" == "php72" -o "$2" == "test72" ]
+ then rep=$rep
+ elif [ "$2" == "remi" ]
+ then rep=php72
+ else rep=${2}72
+ fi
+ type=enterprise
+ ;;
+el?x73)
+ dep=${1:2:1}
+ if [ "$2" == "php73" -o "$2" == "test73" ]
+ then rep=$rep
+ elif [ "$2" == "remi" ]
+ then rep=php73
+ else rep=${2}73
fi
type=enterprise
;;
-el9x74)
- dep=9
+el?x74)
+ dep=${1:2:1}
if [ "$2" == "php74" -o "$2" == "test74" ]
then rep=$rep
elif [ "$2" == "remi" ]
@@ -95,8 +115,8 @@ el9x74)
fi
type=enterprise
;;
-el9x80)
- dep=9
+el?x80)
+ dep=${1:2:1}
if [ "$2" == "php80" -o "$2" == "test80" ]
then rep=$rep
elif [ "$2" == "remi" ]
@@ -105,18 +125,8 @@ el9x80)
fi
type=enterprise
;;
-el8x81)
- dep=8
- if [ "$2" == "php81" -o "$2" == "test81" ]
- then rep=$rep
- elif [ "$2" == "remi" ]
- then rep=php81
- else rep=${2}81
- fi
- type=enterprise
- ;;
-el9x81)
- dep=9
+el?x81)
+ dep=${1:2:1}
if [ "$2" == "php81" -o "$2" == "test81" ]
then rep=$rep
elif [ "$2" == "remi" ]
@@ -316,40 +326,40 @@ fi
if [ $1 = all55 ]; then
n=7
- getOneMock el${n}x php55 '*5.5*'
+ getOneMock el${n}x55 php55 '*5.5*'
elif [ $1 = all56 ]; then
n=7
- getOneMock el${n}x php56 '*5.6*'
+ getOneMock el${n}x56 php56 '*5.6*'
elif [ $1 = all70 ]; then
[ $opt = remi ] && opt=php70
[ $opt = test ] && opt=test70
n=7
- getOneMock el${n}x $opt '*7.0*'
+ getOneMock el${n}x70 $opt '*7.0*'
elif [ $1 = all71 ]; then
[ $opt = remi ] && opt=php71
[ $opt = test ] && opt=test71
n=7
- getOneMock el${n}x $opt '*7.1*'
+ getOneMock el${n}x71 $opt '*7.1*'
elif [ $1 = all72 ]; then
[ $opt = remi ] && opt=php72
[ $opt = test ] && opt=test72
- getOneMock el7x $opt '*7.2*'
+ getOneMock el7x72 $opt '*7.2*'
getOneMock el8x72 $opt '*7.2*'
elif [ $1 = all73 ]; then
[ $opt = remi ] && opt=php73
[ $opt = test ] && opt=test73
- getOneMock el7x $opt '*7.3*'
+ getOneMock el7x73 $opt '*7.3*'
getOneMock el8x73 $opt '*7.3*'
elif [ $1 = all74 ]; then
[ $opt = remi ] && opt=php74
[ $opt = test ] && opt=test74
- getOneMock el7x $opt '*7.4*'
+ getOneMock el7x74 $opt '*7.4*'
getOneMock el8x74 $opt '*7.4*'
getOneMock el9x74 $opt '*7.4*'
@@ -358,7 +368,7 @@ elif [ $1 = all80 ]; then
[ $opt = test ] && opt=test80
getOneMock fc33x $opt '*8.0*'
getOneMock fc34x $opt '*8.0*'
- getOneMock el7x $opt '*8.0*'
+ getOneMock el7x80 $opt '*8.0*'
getOneMock el8x80 $opt '*8.0*'
getOneMock el9x80 $opt '*8.0*'
@@ -368,7 +378,7 @@ elif [ $1 = all81 ]; then
getOneMock fc33x $opt '*8.1*'
getOneMock fc34x $opt '*8.1*'
getOneMock fc35x $opt '*8.1*'
- getOneMock el7x $opt '*8.1*'
+ getOneMock el7x81 $opt '*8.1*'
getOneMock el8x81 $opt '*8.1*'
getOneMock el9x81 $opt '*8.1*'