diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 878915229..32fbde69e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -472,14 +472,18 @@ jobs: run: cmake -E make_directory build - name: Configure CMake run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_WERROR=ON + - name: Delete build directory + run: rm -rf build - name: make deb - working-directory: build run: dpkg-buildpackage -b -d -uc -us -nc -j4 + - name: Copy deb + run: cp ../*.deb - name: Upload artifacts uses: actions/upload-artifact@v4 with: name: debian-${{matrix.debian_version}} - path: "*.deb" + path: | + *.deb build-ubuntu: @@ -549,9 +553,12 @@ jobs: run: cmake -E make_directory build - name: Configure CMake run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_WERROR=ON + - name: Delete build directory + run: rm -rf build - name: make deb - working-directory: build run: dpkg-buildpackage -b -d -uc -us -nc -j4 + - name: Copy deb + run: cp ../*.deb ../*.ddeb . - name: Upload artifacts uses: actions/upload-artifact@v4 with: @@ -633,16 +640,17 @@ jobs: run: cmake -E make_directory build - name: Configure CMake run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_WERROR=ON + - name: Delete build directory + run: rm -rf build - name: Import Ubuntu PPA GPG private key uses: crazy-max/ghaction-import-gpg@v6 with: gpg_private_key: ${{secrets.UBUNTU_PPA_GPG_PRIVATE_KEY}} - name: dpkg-buildpackage - working-directory: build run: dpkg-buildpackage -S -d -k573D197B5EA20EDF - name: Upload Unstable PPA if: github.event_name == 'push' - run: dput ppa:jonaski/strawberry-unstable *_source.changes + run: dput ppa:jonaski/strawberry-unstable ../*_source.changes - name: Upload Stable PPA if: github.event_name == 'release' run: dput ppa:jonaski/strawberry ../*_source.changes diff --git a/.gitignore b/.gitignore index eaf876f18..a9da1b8fd 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /out /CMakeSettings.json /dist/scripts/maketarball.sh +/debian/changelog diff --git a/cmake/Deb.cmake b/cmake/Deb.cmake index 64acfa931..deb3a7a45 100644 --- a/cmake/Deb.cmake +++ b/cmake/Deb.cmake @@ -2,5 +2,5 @@ find_program(LSB_RELEASE_EXEC lsb_release) find_program(DPKG_BUILDPACKAGE dpkg-buildpackage) if (LSB_RELEASE_EXEC AND DPKG_BUILDPACKAGE) - add_custom_target(deb WORKING_DIRECTORY ${CMAKE_BINARY_DIR} COMMAND ${DPKG_BUILDPACKAGE} -b -d -uc -us -nc -j4) + add_custom_target(deb WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMAND ${DPKG_BUILDPACKAGE} -b -d -uc -us -nc -j4) endif() diff --git a/debian/CMakeLists.txt b/debian/CMakeLists.txt index 94ea62730..f7a9c2cf0 100644 --- a/debian/CMakeLists.txt +++ b/debian/CMakeLists.txt @@ -4,11 +4,7 @@ if(LSB_RELEASE_EXEC AND DPKG_BUILDPACKAGE) execute_process(COMMAND /bin/sh "-c" "${LSB_RELEASE_EXEC} -cs" OUTPUT_VARIABLE DEB_CODENAME OUTPUT_STRIP_TRAILING_WHITESPACE) if(DEB_CODENAME AND DEB_DATE) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/control ${CMAKE_CURRENT_BINARY_DIR}/control COPYONLY) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/rules ${CMAKE_CURRENT_BINARY_DIR}/rules COPYONLY) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/changelog.in ${CMAKE_CURRENT_BINARY_DIR}/changelog) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/copyright ${CMAKE_CURRENT_BINARY_DIR}/copyright COPYONLY) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/clean ${CMAKE_CURRENT_BINARY_DIR}/clean COPYONLY) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/changelog.in ${CMAKE_CURRENT_SOURCE_DIR}/changelog) endif() endif() diff --git a/debian/control b/debian/control index 3b5352eb7..cc69f3037 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,7 @@ Source: strawberry Section: sound Priority: optional Maintainer: Jonas Kvinge -Build-Depends: debhelper (>= 11), - debhelper-compat (= 13), +Build-Depends: debhelper-compat (= 12), git, make, cmake, diff --git a/debian/rules b/debian/rules index bf7331a85..8ecc141e2 100755 --- a/debian/rules +++ b/debian/rules @@ -3,5 +3,8 @@ export DH_VERBOSE=1 export DEB_BUILD_MAINT_OPTIONS=hardening=+all +override_dh_installchangelogs: + dh_installchangelogs Changelog + %: dh $@