Merge pull request #1114 from kiwix/update-deb-packages-ci-cd

Update deb packages CI/CD
This commit is contained in:
Kelson 2024-09-01 08:41:30 +00:00 committed by GitHub
commit 69341eab47
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 46 additions and 12 deletions

View File

@ -15,11 +15,16 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
distro: distro:
- debian-unstable # - debian-unstable
# - debian-trixie
# - debian-bookworm
# - debian-bullseye
- ubuntu-noble
- ubuntu-jammy - ubuntu-jammy
- ubuntu-focal - ubuntu-focal
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
# Determine which PPA we should upload to # Determine which PPA we should upload to
- name: PPA - name: PPA
@ -34,18 +39,47 @@ jobs:
env: env:
REF: ${{ github.ref }} REF: ${{ github.ref }}
- uses: legoktm/gh-action-auto-dch@master - uses: legoktm/gh-action-auto-dch@main
with: with:
fullname: Kiwix builder fullname: Kiwix builder
email: release+launchpad@kiwix.org email: release+launchpad@kiwix.org
distro: ${{ matrix.distro }} distro: ${{ matrix.distro }}
- uses: legoktm/gh-action-build-deb@debian-unstable # - uses: legoktm/gh-action-build-deb@debian-unstable
if: matrix.distro == 'debian-unstable' # if: matrix.distro == 'debian-unstable'
name: Build package for debian-unstable # name: Build package for debian-unstable
id: build-debian-unstable # id: build-debian-unstable
# with:
# args: --no-sign
#
# - uses: legoktm/gh-action-build-deb@b47978ba8498dc8b8153cc3b5f99a5fc1afa5de1 # pin@debian-trixie
# if: matrix.distro == 'debian-trixie'
# name: Build package for debian-trixie
# id: build-debian-trixie
# with:
# args: --no-sign
#
# - uses: legoktm/gh-action-build-deb@1f4e86a6bb34aaad388167eaf5eb85d553935336 # pin@debian-bookworm
# if: matrix.distro == 'debian-bookworm'
# name: Build package for debian-bookworm
# id: build-debian-bookworm
# with:
# args: --no-sign
#
# - uses: legoktm/gh-action-build-deb@084b4263209252ec80a75d2c78a586192c17f18d # pin@debian-bullseye
# if: matrix.distro == 'debian-bullseye'
# name: Build package for debian-bullseye
# id: build-debian-bullseye
# with:
# args: --no-sign
- uses: legoktm/gh-action-build-deb@9114a536498b65c40b932209b9833aa942bf108d # pin@ubuntu-noble
if: matrix.distro == 'ubuntu-noble'
name: Build package for ubuntu-noble
id: build-ubuntu-noble
with: with:
args: --no-sign args: --no-sign
ppa: ${{ steps.ppa.outputs.ppa }}
- uses: legoktm/gh-action-build-deb@ubuntu-jammy - uses: legoktm/gh-action-build-deb@ubuntu-jammy
if: matrix.distro == 'ubuntu-jammy' if: matrix.distro == 'ubuntu-jammy'
@ -68,7 +102,7 @@ jobs:
name: Packages for ${{ matrix.distro }} name: Packages for ${{ matrix.distro }}
path: output path: output
- uses: legoktm/gh-action-dput@master - uses: legoktm/gh-action-dput@main
name: Upload dev package name: Upload dev package
# Only upload on pushes to main # Only upload on pushes to main
if: github.event_name == 'push' && github.event.ref == 'refs/heads/main' && startswith(matrix.distro, 'ubuntu-') if: github.event_name == 'push' && github.event.ref == 'refs/heads/main' && startswith(matrix.distro, 'ubuntu-')
@ -77,7 +111,7 @@ jobs:
repository: ppa:kiwixteam/dev repository: ppa:kiwixteam/dev
packages: output/*_source.changes packages: output/*_source.changes
- uses: legoktm/gh-action-dput@master - uses: legoktm/gh-action-dput@main
name: Upload release package name: Upload release package
if: github.event_name == 'release' && startswith(matrix.distro, 'ubuntu-') if: github.event_name == 'release' && startswith(matrix.distro, 'ubuntu-')
with: with:

4
debian/control vendored
View File

@ -4,7 +4,7 @@ Maintainer: Kiwix team <kiwix@kiwix.org>
Build-Depends: debhelper-compat (= 13), Build-Depends: debhelper-compat (= 13),
meson, meson,
pkgconf, pkgconf,
libzim-dev (>= 7.2.0~), libzim-dev (>= 9.0.0~),
libcurl4-gnutls-dev, libcurl4-gnutls-dev,
libicu-dev, libicu-dev,
libgtest-dev, libgtest-dev,
@ -23,7 +23,7 @@ Section: libdevel
Architecture: any Architecture: any
Multi-Arch: same Multi-Arch: same
Depends: libkiwix10 (= ${binary:Version}), ${misc:Depends}, python3, Depends: libkiwix10 (= ${binary:Version}), ${misc:Depends}, python3,
libzim-dev (>= 7.2.0~), libzim-dev (>= 9.0.0~),
libicu-dev, libicu-dev,
libpugixml-dev, libpugixml-dev,
libcurl4-gnutls-dev, libcurl4-gnutls-dev,

View File

@ -35,7 +35,7 @@ else
error('Cannot found header mustache.hpp') error('Cannot found header mustache.hpp')
endif endif
libzim_dep = dependency('libzim', version : '>=8.1.0', static:static_deps) libzim_dep = dependency('libzim', version : '>=9.0.0', static:static_deps)
if not compiler.has_header_symbol('zim/zim.h', 'LIBZIM_WITH_XAPIAN', dependencies: libzim_dep) if not compiler.has_header_symbol('zim/zim.h', 'LIBZIM_WITH_XAPIAN', dependencies: libzim_dep)
error('Libzim seems to be compiled without xapian. Xapian support is mandatory.') error('Libzim seems to be compiled without xapian. Xapian support is mandatory.')
endif endif