diff --git a/.travis.yml b/.travis.yml index 0cc2e3acbb3a..313dbe654b5e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,6 @@ addons: - slapd - zookeeperd - libzookeeper-mt-dev - - libsasl2-dev env: global: @@ -50,6 +49,7 @@ before_install: sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6B05F25D762E3157 sudo add-apt-repository -y ppa:ondrej/php sudo apt update + sudo apt install -y librabbitmq-dev libsodium-dev - | # Start Redis cluster @@ -153,8 +153,6 @@ before_install: phpenv global $PHP INI=~/.phpenv/versions/$PHP/etc/conf.d/travis.ini if ! php --ri sodium > /dev/null; then - # install libsodium - sudo apt-get install libsodium-dev -y tfold ext.libsodium tpecl libsodium sodium.so $INI fi @@ -163,22 +161,7 @@ before_install: tfold ext.igbinary tpecl igbinary-2.0.8 igbinary.so $INI tfold ext.zookeeper tpecl zookeeper-0.6.0 zookeeper.so $INI - if [[ $PHP != 7.3 ]]; then - wget http://ftp.debian.org/debian/pool/main/libr/librabbitmq/librabbitmq-dev_0.5.2-2_amd64.deb - wget http://ftp.debian.org/debian/pool/main/libr/librabbitmq/librabbitmq1_0.5.2-2_amd64.deb - sudo dpkg -i librabbitmq1_0.5.2-2_amd64.deb librabbitmq-dev_0.5.2-2_amd64.deb - tfold ext.amqp tpecl amqp-1.9.3 amqp.so $INI - else - sudo apt install -y librabbitmq-dev - git clone https://github.com/pdezwart/php-amqp.git - cd php-amqp - phpize - ./configure - make - sudo make install - cd - - echo extension = amqp.so >> $INI - fi + tfold ext.amqp tpecl amqp-1.9.4 amqp.so $INI done - |