Skip to content

Commit f9850f8

Browse files
ci: Build shared linux against system lib. (#228)
This stops building harfbuzz separately and tries just using the system install to make sure that works. This means that we build against an older version depending on what's available on Ubuntu (since our macOS build uses homebrew which tends to be fairly current). Currently, that's version 2.7.4, the same as we're currently building and packaging. Going forward, as we update what's in use here, that should help us make sure that we're working with older versions that can be found in the field, but we'll have to take care to feature-gate newer APIs.
1 parent cf22900 commit f9850f8

File tree

2 files changed

+3
-61
lines changed

2 files changed

+3
-61
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,10 @@ jobs:
1616
steps:
1717
- uses: actions/checkout@v3
1818

19-
# Install harfbuzz from the source in harfbuzz-sys. Use an out-of-tree
20-
# build to avoid contaminating the source tree.
21-
- name: Build harfbuzz
22-
env:
23-
PREFIX: /usr/local
19+
- name: install harfbuzz from apt
2420
run: |
25-
make -f harfbuzz-sys/makefile.touch touch HARFBUZZ=harfbuzz-sys/harfbuzz
26-
HARFDIR=`pwd`
27-
pushd $RUNNER_TEMP
28-
$HARFDIR/harfbuzz-sys/harfbuzz/configure --prefix=$PREFIX --without-icu --without-freetype --without-glib
29-
make
30-
sudo make install
31-
# Make harfbuzz available for linking and confirm expected location
32-
TEMP_PATH="$(pkg-config --variable=libdir harfbuzz)"
33-
echo "LD_LIBRARY_PATH=$TEMP_PATH" >> $GITHUB_ENV
34-
[[ "$TEMP_PATH" == "$PREFIX/lib" ]] || exit 1
35-
popd
21+
sudo apt update
22+
sudo apt install libharfbuzz-dev
3623
3724
- name: Install stable toolchain
3825
uses: dtolnay/rust-toolchain@stable

harfbuzz-sys/makefile.touch

Lines changed: 0 additions & 45 deletions
This file was deleted.

0 commit comments

Comments
 (0)