Skip to content

Commit

Permalink
Rename/reorganize workflow a bit
Browse files Browse the repository at this point in the history
  • Loading branch information
alex1701c committed Oct 13, 2024
1 parent ba1de45 commit 70e014c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
10 changes: 7 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
inputs:
publish-version:
description: "new version that should get published"
required: false
required: true

jobs:
build:
Expand Down Expand Up @@ -59,9 +59,11 @@ jobs:
echo 'APT::Get::Assume-Yes "true";' >> /etc/apt/apt.conf
elif [[ "${{ matrix.os.name }}" == "fedora" ]]; then
echo "defaultyes=True" >> /etc/dnf/dnf.conf
dnf install rpm-build
elif [[ "${{ matrix.os.name }}" == "opensuse" ]]; then
zypper refresh
CMD=$(echo $CMD | sed 's/zypper/zypper --non-interactive/')
zypper install rpm-build
else
echo "Unsupported OS: ${{ matrix.os.name }}"
exit 1
Expand All @@ -86,10 +88,12 @@ jobs:
CMAKE_ARGS="$CMAKE_ARGS -DCPACK_OS=${{ matrix.os.name }}"
fi
if [[ "${{ matrix.plasma_version }}" == "plasma6" ]]; then
cmake $CMAKE_ARGS -DBUILD_WITH_QT6=ON
CMAKE_ARGS="$CMAKE_ARGS -DBUILD_WITH_QT6=ON"
else
cmake $CMAKE_ARGS -DBUILD_WITH_QT6=OFF
CMAKE_ARGS="$CMAKE_ARGS -DBUILD_WITH_QT6=OFF"
fi
echo cmake $CMAKE_ARGS
cmake $CMAKE_ARGS
cmake --build . -j2
cmake --install .
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ else()
set(KRUNNER_PACKAGE_VERSION ${KF6Runner_VERSION})
endif()
# Then names of dependencies and paths might differ
if (CPACK_OS STREQUAL "debian")
if (CPACK_OS STREQUAL "ubuntu")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libkf5runner5 (>=${KRUNNER_PACKAGE_VERSION})")
set(CPACK_DEBIAN_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-Debian.deb")
set(CPACK_GENERATOR "DEB")
Expand Down

0 comments on commit 70e014c

Please sign in to comment.