Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ jobs:
$SUDO apt-get update
# Debian provides the i386 libxdo development package that Ubuntu
# does not publish for this architecture.
$SUDO apt-get install -y bash clang file libclang-dev \
$SUDO apt-get install --no-install-recommends -y libclang-dev \
${{ matrix.settings.cross_gcc }} \
${{ matrix.settings.cross_gpp }} \
${{ matrix.settings.cross_sys_deps }}
Expand All @@ -270,7 +270,9 @@ jobs:
libgdk-pixbuf-2.0-dev \
libgtk-3-dev \
libxdo-dev; do
test "$(dpkg-query -W -f='${Architecture}' "$package:i386")" = i386
architecture="$(dpkg-query -W -f='${Architecture}' "$package:i386")"
echo "$package:i386 -> $architecture"
test "$architecture" = i386
done

export PKG_CONFIG_ALLOW_CROSS=1
Expand All @@ -284,11 +286,15 @@ jobs:
atk \
gdk-pixbuf-2.0 \
gtk+-3.0; do
echo "Checking $pc_file through i386 pkg-config"
pkg-config --exists "$pc_file"
test "$(pkg-config --variable=pcfiledir "$pc_file")" = /usr/lib/i386-linux-gnu/pkgconfig
pcfiledir="$(pkg-config --variable=pcfiledir "$pc_file")"
echo "$pc_file -> $pcfiledir"
test "$pcfiledir" = /usr/lib/i386-linux-gnu/pkgconfig
done

file -L /usr/lib/i386-linux-gnu/libxdo.so | grep -E 'ELF 32-bit.*Intel 80386'
# libxdo-dev does not ship pkg-config metadata. Its i386 package
# architecture is validated in the package loop above.

- name: Install cross-compilation dependencies (Linux ARM)
if: runner.os == 'Linux' && matrix.settings.cross_arch && matrix.settings.cross_arch != 'i386'
Expand Down Expand Up @@ -325,14 +331,6 @@ jobs:
run: ${{ matrix.settings.build_script || format('bun run build --target {0}', matrix.settings.target) }}
shell: bash

- name: Verify Linux ia32 addon
if: matrix.settings.target == 'i686-unknown-linux-gnu'
run: |
set -euo pipefail
test -s webview.linux-ia32-gnu.node
file webview.linux-ia32-gnu.node | grep -E 'ELF 32-bit.*Intel 80386'
shell: bash

- name: Upload artifact
uses: actions/upload-artifact@v4
with:
Expand Down
Loading