@@ -320,16 +320,12 @@ jobs:
320320 - name : Uninstall system MySQL/MariaDB
321321 run : |
322322 sudo apt purge `{ dpkg --get-selections '*mysql*'; dpkg --get-selections '*mariadb*'; } | sed 's/[:\t].*//'`
323- - name : Install client dependences (1)
324- if : ${{ matrix.client-version != 'system' && ( matrix.server-version != 'system' || matrix.client-version != 'same-as-server' ) }}
325- run : |
326- sudo apt install libgnutls28-dev libncurses5 libncursesw5 libstdc++5
327- - name : Install client dependences (2)
323+ - name : Install client dependencies
328324 if : ${{ matrix.client-version != 'system' && ( matrix.server-version != 'system' || matrix.client-version != 'same-as-server' ) }}
329325 run : |
330326 wget --progress=bar:force http://security.ubuntu.com/ubuntu/pool/main/o/openssl1.0/libssl1.0.0_1.0.2n-1ubuntu5_amd64.deb -O /tmp/libssl1.0.0_1.0.2n-1ubuntu5_amd64.deb
331327 wget --progress=bar:force http://security.ubuntu.com/ubuntu/pool/universe/j/jemalloc/libjemalloc1_3.6.0-11_amd64.deb -O /tmp/libjemalloc1_3.6.0-11_amd64.deb
332- sudo dpkg -i /tmp/libssl1.0.0_1.0.2n-1ubuntu5_amd64.deb /tmp/libjemalloc1_3.6.0-11_amd64.deb
328+ sudo apt install libgnutls28-dev libncurses5 libncursesw5 libstdc++5 /tmp/libssl1.0.0_1.0.2n-1ubuntu5_amd64.deb /tmp/libjemalloc1_3.6.0-11_amd64.deb
333329 - name : Install MariaDB client system
334330 if : ${{ matrix.client-version == 'system' || ( matrix.server-version == 'system' && matrix.client-version == 'same-as-server' ) }}
335331 run : |
@@ -541,7 +537,7 @@ jobs:
541537 export DBD_MARIADB_REQUIREEMBSUP=1
542538 fi
543539 export | sed 's/^declare -x //;s/="/=/;s/"$//' | grep '^DBD_MARIADB_' >> $GITHUB_ENV
544- - name : Install dependences
540+ - name : Install dependencies
545541 run : |
546542 if [ "${{ matrix.perl-version }}" = "system" ]; then
547543 eval $(perl -I"$HOME/perl5/lib/perl5" -Mlocal::lib)
0 commit comments