Skip to content

Commit 0baa56c

Browse files
committed
ci: enable C-style operators and GTK3 for the IDE build
The IDE is upstream objfpc code that uses `+=`; the lazbuild build path (unlike the Makefile's -Sci) needs C-operators enabled, so add -Sci to the generated fpc.cfg on both runners. Upstream also defaults the Linux widgetset to gtk3, so swap libgtk2.0-dev for libgtk-3-dev on the Linux runner.
1 parent ad9af2e commit 0baa56c

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

‎.github/workflows/linux.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
sudo apt-get update -o Acquire::Retries=3
2020
sudo apt-get install -y --no-install-recommends \
2121
make zip rsync curl \
22-
libgtk2.0-dev libcairo2-dev libpango1.0-dev \
22+
libgtk-3-dev libcairo2-dev libpango1.0-dev \
2323
libgdk-pixbuf2.0-dev libatk1.0-dev libgl1-mesa-dev
2424
2525
- name: Download FPC Unleashed nightly
@@ -33,6 +33,9 @@ jobs:
3333
target=x86_64-linux
3434
{
3535
echo "# FPC Unleashed minimal config"
36+
# the IDE is upstream objfpc code that uses C-style operators (+=); the
37+
# Makefile build passes -Sci but the lazbuild IDE build does not
38+
echo "-Sci"
3639
for d in "$HOME/fpc/units/$target"/*/; do
3740
[ -d "$d" ] || continue
3841
echo "-Fu${d%/}"

‎.github/workflows/windows.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ jobs:
2727
run: |
2828
$target = "x86_64-win64"
2929
$cfg = "C:\fpc\bin\$target\fpc.cfg"
30-
$lines = @("# FPC Unleashed minimal config")
30+
# the IDE is upstream objfpc code that uses C-style operators (+=); the
31+
# Makefile build passes -Sci but the lazbuild IDE build does not
32+
$lines = @("# FPC Unleashed minimal config", "-Sci")
3133
foreach ($d in Get-ChildItem -Path "C:\fpc\units\$target" -Directory) {
3234
$lines += "-Fu$($d.FullName)"
3335
}

0 commit comments

Comments
 (0)