Skip to content

Commit 5ede76e

Browse files
andy5995claude
andauthored
CI: various improvements (#517)
* ci: fix SETUP_OPTIONS unset variable error on OpenBSD OpenBSD's sh treats unset variables as errors. Use ${SETUP_OPTIONS:-} to default to empty string when the variable is not defined. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * ci: fix several issues in c-cpp workflow - Fix macOS matrix references: matrix.build.install_packages and matrix.build.setup_options had a spurious .build. nesting, causing setup options and extra packages to be silently ignored - OpenBSD: use gettext-tools package name and add -Dnls=false since gettext is unavailable there - Use ${SETUP_OPTIONS:-} in the build job to avoid unset variable errors - Replace pip install of meson/ninja with apt-get on Ubuntu runners Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * ci: remove freebsd-15-0-snap task from Cirrus CI Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent a02b21e commit 5ede76e

File tree

2 files changed

+7
-18
lines changed

2 files changed

+7
-18
lines changed

.cirrus.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,6 @@ freebsd_task:
2828
- meson setup builddir
2929
<<: *common_meson_steps
3030

31-
freebsd_task:
32-
<<: *filter_template
33-
name: freebsd-15-0-snap
34-
freebsd_instance:
35-
image_family: freebsd-15-0-snap
36-
<<: *common_freebsd_steps
37-
setup_script:
38-
- meson setup builddir
39-
<<: *common_meson_steps
40-
4131
arm_task:
4232
<<: *filter_template
4333
arm_container:

.github/workflows/c-cpp.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,8 @@ jobs:
8585
sudo apt upgrade -y
8686
sudo apt-get install -y \
8787
gettext \
88-
python3-pip \
89-
python3-setuptools
90-
sudo -H python3 -m pip install meson ninja
88+
meson \
89+
ninja-build
9190
9291
- if: ${{ contains(matrix.container, 'alpine') }}
9392
run: |
@@ -100,7 +99,7 @@ jobs:
10099
zypper --non-interactive update
101100
102101
- name: Configure
103-
run: meson setup builddir $SETUP_OPTIONS ${{ matrix.setup_options }}
102+
run: meson setup builddir ${SETUP_OPTIONS:-} ${{ matrix.setup_options }}
104103

105104
- name: Build
106105
run: |
@@ -122,10 +121,10 @@ jobs:
122121
with:
123122
usesh: true
124123
prepare: |
125-
pkg_add gettext git meson ninja
124+
pkg_add gettext-tools git meson ninja
126125
127126
run: |
128-
meson setup builddir -Db_sanitize=none $SETUP_OPTIONS || cat builddir/meson-logs/meson-log.txt
127+
meson setup builddir -Db_sanitize=none -Dnls=false ${SETUP_OPTIONS:-} || cat builddir/meson-logs/meson-log.txt
129128
cd builddir
130129
meson compile -v
131130
meson test -v --suite rmw
@@ -159,10 +158,10 @@ jobs:
159158
ninja \
160159
ncurses \
161160
pkg-config \
162-
${{ matrix.build.install_packages }}
161+
${{ matrix.install_packages }}
163162
164163
- name: Configure
165-
run: meson setup builddir ${{ matrix.build.setup_options }}
164+
run: meson setup builddir ${{ matrix.setup_options }}
166165

167166
- name: Build
168167
run: |

0 commit comments

Comments
 (0)