Skip to content

Commit e16092a

Browse files
committed
Install systemd-rpm-macros when building RPM
1 parent 9df9c3e commit e16092a

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

.github/workflows/rpm.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
id: install-dependencies
1717
run: |
1818
echo "${{ github.action }}: Installing dependencies"
19-
dnf install -y -q rpmdevtools boost-devel cmake cppcheck clang clang-analyzer clang-tools-extra gcc gcc-c++ gtest gtest-devel pkgconf-pkg-config dbus-libs dbus-devel libstdc++ 2>&1 1>/dev/null
19+
dnf install -y -q rpmdevtools systemd-rpm-macros boost-devel cmake cppcheck clang clang-analyzer clang-tools-extra gcc gcc-c++ gtest gtest-devel pkgconf-pkg-config dbus-libs dbus-devel libstdc++ 2>&1 1>/dev/null
2020
- name: pepare-git
2121
run: |
2222
dnf install -y -q git 2>&1 1>/dev/null

.github/workflows/tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
id: install-dependencies
2424
run: |
2525
echo "${{ github.action }}: Installing dependencies"
26-
dnf install -y -q rpmdevtools boost-devel cmake clang clang-analyzer clang-tools-extra gcc gcc-c++ gtest gtest-devel pkgconf-pkg-config dbus-libs dbus-devel libstdc++ 2>&1 1>/dev/null
26+
dnf install -y -q rpmdevtools systemd-rpm-macros boost-devel cmake clang clang-analyzer clang-tools-extra gcc gcc-c++ gtest gtest-devel pkgconf-pkg-config dbus-libs dbus-devel libstdc++ 2>&1 1>/dev/null
2727
- name: pepare-git
2828
run: |
2929
dnf install -y -q git 2>&1 1>/dev/null

.gitlab-ci.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ build (s)rpm:
139139
- .skip_manual_for_pr_template
140140
stage: "🚧 Build Stage 2"
141141
script:
142-
- sudo dnf install -y rpmdevtools
142+
- sudo dnf install -y rpmdevtools systemd-rpm-macros
143143
- sed -i "s/set(CPACK_RPM_PACKAGE_RELEASE \"[0-9]\+\")/set(CPACK_RPM_PACKAGE_RELEASE \"${CI_PIPELINE_IID}\")/" packaging/rpm/cpack_config.cmake
144144
- cmake . -B $BUILD_WORKSPACE -DAPS_CHRONY_DBUS_SERVICE_FETCH_CONTENT_USE_GITLAB_CI_TOKEN=ON -DCMAKE_BUILD_TYPE=Release -DAPS_CHRONY_DBUS_SERVICE_BUILD_TESTS=OFF -DAPS_CHRONY_DBUS_SERVICE_CPACK_RPM_TYPE=RPM
145145
- cmake --build $BUILD_WORKSPACE --parallel $PARALLEL
@@ -310,4 +310,3 @@ lint-rpm:
310310
######################################
311311
# 🌃 Nightly
312312
######################################
313-

0 commit comments

Comments
 (0)