diff --git a/.github/workflows/main-ci.yml b/.github/workflows/main-ci.yml index 619fe808..7011eeff 100644 --- a/.github/workflows/main-ci.yml +++ b/.github/workflows/main-ci.yml @@ -38,7 +38,6 @@ jobs: sed -i -- 's/OCI8=true/OCI8=false/g' .env sed -i -- 's/IONCUBE=true/IONCUBE=false/g' .env sed -i -- 's/V8JS=true/V8JS=false/g' .env - sed -i -- 's/AUDIOWAVEFORM=true/AUDIOWAVEFORM=false/g' .env docker-compose build ${{ matrix.service }} docker-compose up -d --no-deps -- ${{ matrix.service }} docker-compose exec -T -- ${{ matrix.service }} php -m diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 8e764285..9eb184b7 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -990,19 +990,17 @@ ARG INSTALL_AUDIOWAVEFORM=false RUN if [ ${INSTALL_AUDIOWAVEFORM} = true ]; then \ apt-get -y install wget make cmake gcc g++ libmad0-dev libid3tag0-dev libsndfile1-dev libgd-dev libboost-filesystem-dev libboost-program-options-dev libboost-regex-dev \ + && cd /tmp \ && git clone https://github.com/bbc/audiowaveform.git \ && cd audiowaveform \ - && wget https://github.com/google/googletest/archive/release-1.10.0.tar.gz \ - && tar xzf release-1.10.0.tar.gz \ - && ln -s googletest-release-1.10.0/googletest googletest \ - && ln -s googletest-release-1.10.0/googlemock googlemock \ + && git clone --depth=1 https://github.com/google/googletest.git -b release-1.11.0 \ && mkdir build \ && cd build \ && cmake .. \ && make \ && make install \ ;fi - + ##################################### # wkhtmltopdf: