From 0e6a8578d1a5a6f89190430598f9910c93e59f6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Fri, 16 Oct 2026 14:16:27 +0200 Subject: [PATCH] ci: install libbrotli-dev instead of reinstalling it --- .github/workflows/release.yaml | 4 ++-- .github/workflows/tests.yaml | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 3ea099d2ff..f23fd55fe0 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -168,8 +168,8 @@ jobs: name: Set CGO flags run: echo "CGO_CFLAGS=-I${PWD}/watcher/target/include $(php-config --includes)" >> "${GITHUB_ENV}" - if: steps.state.outputs.resume != 'true' - name: Install wrk - run: sudo apt-get update && sudo apt-get install -y wrk && sudo apt-get install --reinstall -y libbrotli-dev + name: Install wrk and libbrotli-dev + run: sudo apt-get update && sudo apt-get install -y wrk libbrotli-dev - if: steps.state.outputs.resume != 'true' name: Refresh PGO profile run: ./profiles/build-pgo.sh diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 0d9a0c04eb..39f3419362 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -49,9 +49,8 @@ jobs: php-version: ${{ matrix.php-versions }} - name: Install e-dant/watcher uses: ./.github/actions/watcher - - name: Reinstall libbrotli-dev - # TODO: remove this workaround when fixed upstream - run: sudo apt-get install --reinstall -y libbrotli-dev + - name: Install libbrotli-dev + run: sudo apt-get install -y libbrotli-dev - name: Set CGO flags run: echo "CGO_CFLAGS=-I${PWD}/watcher/target/include -DFRANKENPHP_TEST $(php-config --includes)" >> "${GITHUB_ENV}" - name: Build