diff options
| author | Remi Collet <remi@remirepo.net> | 2021-11-29 10:28:53 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2021-11-29 10:28:53 +0100 |
| commit | 2be11350a1bf8f67197268c22342dc88e28abaff (patch) | |
| tree | 0bd66670f740f7f0564ceb124e109113426735d2 | |
| parent | 4df1b6b7174643744ae3ad993616c25f3ca8ce12 (diff) | |
also use php version specific buildroot on Fedora
| -rw-r--r-- | buildfct | 2 | ||||
| -rwxr-xr-x | getmock | 30 |
2 files changed, 26 insertions, 6 deletions
@@ -278,7 +278,7 @@ if [ -f "$1" ]; then pids="$pids $!" done echo -n "" - (mock $quiet --configdir=$mocketc -r el${i}x --enablerepo=remi-php74 rebuild "$@" && echo "$(date +%X) (74) el$i Ok." || echo "el$i Error !")& + (mock $quiet --configdir=$mocketc -r el7x --enablerepo=remi-php74 rebuild "$@" && echo "$(date +%X) (74) el7 Ok." || echo "el7 Error !")& pids="$pids $!" echo -n "" (mock $quiet --configdir=$mocketc -r el8x rebuild "$@" && echo "$(date +%X) (74) el8 Ok." || echo "el8 Error !")& @@ -135,6 +135,26 @@ el?x81) fi type=enterprise ;; +fc??x80) + dep=${1:2:2} + if [ "$2" == "php80" -o "$2" == "test80" ] + then rep=$rep + elif [ "$2" == "remi" ] + then rep=php80 + else rep=${2}80 + 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 + ;; el*) dep=${dep#el} type=enterprise ;; @@ -366,8 +386,8 @@ elif [ $1 = all74 ]; then elif [ $1 = all80 ]; then [ $opt = remi ] && opt=php80 [ $opt = test ] && opt=test80 - getOneMock fc33x $opt '*8.0*' - getOneMock fc34x $opt '*8.0*' + getOneMock fc33x80 $opt '*8.0*' + getOneMock fc34x80 $opt '*8.0*' getOneMock el7x80 $opt '*8.0*' getOneMock el8x80 $opt '*8.0*' getOneMock el9x80 $opt '*8.0*' @@ -375,9 +395,9 @@ elif [ $1 = all80 ]; then elif [ $1 = all81 ]; then [ $opt = remi ] && opt=php81 [ $opt = test ] && opt=test81 - getOneMock fc33x $opt '*8.1*' - getOneMock fc34x $opt '*8.1*' - getOneMock fc35x $opt '*8.1*' + getOneMock fc33x81 $opt '*8.1*' + getOneMock fc34x81 $opt '*8.1*' + getOneMock fc35x81 $opt '*8.1*' getOneMock el7x81 $opt '*8.1*' getOneMock el8x81 $opt '*8.1*' getOneMock el9x81 $opt '*8.1*' |