From 3fdbb5a990428f1d144cb7740c1fb37ac9b64e86 Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Wed, 26 Jul 2023 20:59:21 +0200 Subject: [PATCH 1/4] Push on 'release' PPA triggered by 'release' event --- .github/workflows/package.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 5d4b90dab..fdec75be4 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -5,6 +5,8 @@ on: push: branches: - main + release: + types: [published] jobs: build-deb: @@ -60,7 +62,7 @@ jobs: - uses: legoktm/gh-action-dput@master name: Upload dev package - # Only upload on pushes to git default branch + # Only upload on pushes to main if: github.event_name == 'push' && github.event.ref == 'refs/heads/main' && startswith(matrix.distro, 'ubuntu-') with: gpg_key: ${{ secrets.LAUNCHPAD_GPG }} @@ -69,10 +71,8 @@ jobs: - uses: legoktm/gh-action-dput@master name: Upload release package - # Only upload on pushes to master or tag - if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags') && startswith(matrix.distro, 'ubuntu-') + if: github.event_name == 'release' && startswith(matrix.distro, 'ubuntu-') with: gpg_key: ${{ secrets.LAUNCHPAD_GPG }} repository: ppa:kiwixteam/release packages: output/*_source.changes - From b861dfc9dd570438279e8cb5fd18eff31a1341d9 Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Wed, 26 Jul 2023 20:59:49 +0200 Subject: [PATCH 2/4] Use pinned version of Ubuntu for workflow --- .github/workflows/package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index fdec75be4..e0642b548 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -10,7 +10,7 @@ on: jobs: build-deb: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 strategy: fail-fast: false matrix: From 177e1d5da6e4df3ba42c12a957b86ec1c701d331 Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Wed, 26 Jul 2023 21:02:55 +0200 Subject: [PATCH 3/4] Use latest base image_variant v38 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b8a8fe8c1..5726a7b99 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -83,7 +83,7 @@ jobs: HOME: /home/runner runs-on: ubuntu-20.04 container: - image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:37" + image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:38" steps: - name: Checkout code uses: actions/checkout@v3 From efdb59656170ef5a29f4114c5004eeade84fd8c6 Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Wed, 26 Jul 2023 21:09:50 +0200 Subject: [PATCH 4/4] Add Debian package building in CI --- .github/workflows/package.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index e0642b548..7114017a3 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -15,6 +15,7 @@ jobs: fail-fast: false matrix: distro: + - debian-unstable - ubuntu-jammy - ubuntu-focal steps: @@ -39,6 +40,13 @@ jobs: email: release+launchpad@kiwix.org distro: ${{ matrix.distro }} + - uses: legoktm/gh-action-build-deb@debian-unstable + if: matrix.distro == 'debian-unstable' + name: Build package for debian-unstable + id: build-debian-unstable + with: + args: --no-sign + - uses: legoktm/gh-action-build-deb@ubuntu-jammy if: matrix.distro == 'ubuntu-jammy' name: Build package for ubuntu-jammy