Skip to content

Commit 89bf4d5

Browse files
authored
ci: install libbrotli-dev instead of reinstalling it (#2723)
#2391 added `apt-get install --reinstall -y libbrotli-dev` because the ubuntu-24.04 image listed `libbrotli-dev` as installed while its headers and `.pc` files were missing, which turned a plain install into a no-op. That state is gone. The latest `main` run (image 20261004.327.1, https://github.com/php/frankenphp/actions/runs/38149908385) shows `The following NEW packages will be installed: libbrotli-dev`: the image no longer ships the package at all, only the `brotli` CLI (see the [image readme](https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md)). Nothing will be fixed upstream, so the step stays, as a regular install, and the TODO goes away.
1 parent c035bcf commit 89bf4d5

2 files changed

Lines changed: 4 additions & 5 deletions

File tree

‎.github/workflows/release.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,8 @@ jobs:
168168
name: Set CGO flags
169169
run: echo "CGO_CFLAGS=-I${PWD}/watcher/target/include $(php-config --includes)" >> "${GITHUB_ENV}"
170170
- if: steps.state.outputs.resume != 'true'
171-
name: Install wrk
172-
run: sudo apt-get update && sudo apt-get install -y wrk && sudo apt-get install --reinstall -y libbrotli-dev
171+
name: Install wrk and libbrotli-dev
172+
run: sudo apt-get update && sudo apt-get install -y wrk libbrotli-dev
173173
- if: steps.state.outputs.resume != 'true'
174174
name: Refresh PGO profile
175175
run: ./profiles/build-pgo.sh

‎.github/workflows/tests.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,8 @@ jobs:
4949
php-version: ${{ matrix.php-versions }}
5050
- name: Install e-dant/watcher
5151
uses: ./.github/actions/watcher
52-
- name: Reinstall libbrotli-dev
53-
# TODO: remove this workaround when fixed upstream
54-
run: sudo apt-get install --reinstall -y libbrotli-dev
52+
- name: Install libbrotli-dev
53+
run: sudo apt-get install -y libbrotli-dev
5554
- name: Set CGO flags
5655
run: echo "CGO_CFLAGS=-I${PWD}/watcher/target/include -DFRANKENPHP_TEST $(php-config --includes)" >> "${GITHUB_ENV}"
5756
- name: Build

0 commit comments

Comments
 (0)