Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

GHA: Fix seemingly random -m32 build failures #1121

Merged
merged 1 commit into from
Feb 6, 2025
+8 −8
Merged

GHA: Fix seemingly random -m32 build failures #1121

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,14 @@ jobs:
mkdir -p '${{ steps.vars.outputs.PKG_DIR }}'
mkdir -p '${{ steps.vars.outputs.PKG_DIR }}'/bin

- name: "Ubuntu: Prepare multilib (i386)"
if: ${{ contains(matrix.job.os, 'ubuntu') && contains(matrix.job.ocaml-version, '-32bit') }}
run: |
sudo dpkg --add-architecture i386
sudo apt-get update
sudo apt-get install gcc-multilib g++-multilib libgtk-3-dev:i386 libexpat1-dev:i386
echo PKG_CONFIG_LIBDIR=/usr/lib/i386-linux-gnu/pkgconfig:/usr/share/pkgconfig:"$PKG_CONF_LIBDIR" >> "$GITHUB_ENV"

- name: Use OCaml ${{ matrix.job.ocaml-version }}
uses: ocaml/setup-ocaml@v3
with:
Expand Down Expand Up @@ -421,14 +429,6 @@ jobs:
'@ | patch -Nu -p 1
opam pin --no-action add lablgtk3 .

- name: "Ubuntu: Prepare lablgtk install (i386)"
if: ${{ contains(matrix.job.os, 'ubuntu') && contains(matrix.job.ocaml-version, '-32bit') }}
run: |
sudo dpkg --add-architecture i386
sudo apt-get update
sudo apt-get install libgtk-3-dev:i386 libexpat1-dev:i386
echo PKG_CONFIG_LIBDIR=/usr/lib/i386-linux-gnu/pkgconfig:/usr/share/pkgconfig:"$PKG_CONF_LIBDIR" >> "$GITHUB_ENV"

# [2024-12] Recent dune release switched from using pkg-config to pkgconf.
# However, pkgconf is broken in many environments and this breaks building
# cairo2, a dependency for lablgtk3 (and likely would break lablgtk3, too,
Expand Down
Loading