Skip to content

Commit e5147ac

Browse files
committed
Fix installing ctags in other distros
1 parent 7c44d8f commit e5147ac

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,5 @@ jobs:
6060
- name: Build (Python ${{ matrix.python }})
6161
run: |
6262
set -x
63-
python -m build -Cbuild-dir=_build
64-
python -m pip install .
65-
cd _build && python -m sphinx -b html -W -v ../docs html
63+
uv build
64+
cd _build && uv run --group docs --no-editable -m sphinx -b html -W -v ../docs html

.github/workflows/install.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,18 @@ jobs:
4848
pkg-config
4949
python3
5050
systemd
51-
universal-ctags
5251
)
5352
5453
case "$DIST_ID" in
5554
arch)
56-
pacman --noconfirm -Sy "${DEPS_COMMON[@]}" systemd-libs python-pip
55+
pacman --noconfirm -Sy "${DEPS_COMMON[@]}" systemd-libs python-pip ctags
5756
;;
5857
centos|fedora)
59-
dnf -y install "${DEPS_COMMON[@]}" systemd-devel python3-devel python3-pip
58+
dnf -y install "${DEPS_COMMON[@]}" systemd-devel python3-devel python3-pip ctags
6059
;;
6160
ubuntu|debian)
6261
apt -y update
63-
DEBIAN_FRONTEND=noninteractive apt -y install "${DEPS_COMMON[@]}" libsystemd-dev python3-dev python3-pip
62+
DEBIAN_FRONTEND=noninteractive apt -y install "${DEPS_COMMON[@]}" libsystemd-dev python3-dev python3-pip universal-ctags
6463
;;
6564
*)
6665
echo >&2 "Invalid distribution ID: $DISTRO_ID"

meson.build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ run_target(
4646

4747
# Run target to generate TAGS file for Emacs
4848
run_target(
49-
'etags',
50-
command: ['etags', '-R', '@SOURCE_ROOT@/systemd'],
49+
'ctags',
50+
command: ['ctags', '-R', '@SOURCE_ROOT@/systemd'],
5151
)
5252

5353
# Use 'uv run' to ensure Sphinx and its dependencies are installed before being run.

0 commit comments

Comments
 (0)