From b1bb9fbd1c1835b06180ba30c7db0776155e866f Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Wed, 3 Feb 2021 17:40:43 +0000 Subject: [PATCH] Reinstall PHP deps on cache hit the 20.04 actions image doesn't have libzip5 and who knows what else is missing ... --- .github/workflows/main.yml | 12 ++++++++++++ tests/gh-actions/build.sh | 1 + 2 files changed, 13 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c4d5c37d3..3c5f202c2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -53,6 +53,10 @@ jobs: if: steps.php-build-cache.outputs.cache-hit != 'true' run: exit 1 + - name: Install cached PHP's dependencies + if: steps.php-build-cache.outputs.cache-hit == 'true' + run: chmod +x ./bin/php7/install-dependencies.sh && ./bin/php7/install-dependencies.sh + - name: Prefix PHP to PATH run: echo "$(pwd)/bin/php7/bin" >> $GITHUB_PATH @@ -99,6 +103,10 @@ jobs: if: steps.php-build-cache.outputs.cache-hit != 'true' run: exit 1 + - name: Install cached PHP's dependencies + if: steps.php-build-cache.outputs.cache-hit == 'true' + run: chmod +x ./bin/php7/install-dependencies.sh && ./bin/php7/install-dependencies.sh + - name: Prefix PHP to PATH run: echo "$(pwd)/bin/php7/bin" >> $GITHUB_PATH @@ -147,6 +155,10 @@ jobs: if: steps.php-build-cache.outputs.cache-hit != 'true' run: exit 1 + - name: Install cached PHP's dependencies + if: steps.php-build-cache.outputs.cache-hit == 'true' + run: chmod +x ./bin/php7/install-dependencies.sh && ./bin/php7/install-dependencies.sh + - name: Prefix PHP to PATH run: echo "$(pwd)/bin/php7/bin" >> $GITHUB_PATH diff --git a/tests/gh-actions/build.sh b/tests/gh-actions/build.sh index a5c184078..905da6970 100755 --- a/tests/gh-actions/build.sh +++ b/tests/gh-actions/build.sh @@ -23,3 +23,4 @@ cd php-build echo '"pthreads",,"https://github.com/pmmp/pthreads.git",,,"extension",' >> share/php-build/extension/definition PHP_BUILD_INSTALL_EXTENSION='pthreads=@2bcd8b8c10395d58b8a9bc013e3a5328080c867f yaml=2.2.0' PHP_BUILD_ZTS_ENABLE=on ./bin/php-build "$VERSION" "$INSTALL_DIR" rm "$INSTALL_DIR/etc/conf.d/xdebug.ini" || true +cp install-dependencies.sh "$INSTALL_DIR"