From 84411a98ae05365ade1d33113ea30469ea0c8adc Mon Sep 17 00:00:00 2001 From: John Factotum <50942278+johnfactotum@users.noreply.github.com> Date: Sun, 30 Jul 2023 08:58:12 +0000 Subject: [PATCH 1/6] Restore GitHub Action for building Debian package --- .github/workflows/deb.yml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .github/workflows/deb.yml diff --git a/.github/workflows/deb.yml b/.github/workflows/deb.yml new file mode 100644 index 00000000..1e5199ad --- /dev/null +++ b/.github/workflows/deb.yml @@ -0,0 +1,34 @@ +# This is a basic workflow to help you get started with Actions + +name: Build Debian Package + +# Controls when the action will run. +on: + # Triggers the workflow on push or pull request events but only for the master branch + push: + branches: [ gtk4 ] + pull_request: + branches: [ gtk4 ] + + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # This workflow contains a single job called "build" + build: + # The type of runner that the job will run on + runs-on: ubuntu-latest + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v2 + + - run: sudo apt install build-essential debhelper meson gettext pkg-config libglib2.0-dev gjs appstream + - run: dpkg-buildpackage -us -uc -nc + - run: mv ../*.deb . + - uses: actions/upload-artifact@v2 + with: + name: Debian Package + path: "*.deb" From b2d04e86ab97bbc6c63e65f8a1f4168da94eec27 Mon Sep 17 00:00:00 2001 From: John Factotum <50942278+johnfactotum@users.noreply.github.com> Date: Tue, 14 Nov 2023 01:42:10 +0000 Subject: [PATCH 2/6] Update debhelper-compat --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index f302a267..119cd95d 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: foliate Section: gnome Priority: optional Maintainer: John Factotum <50942278+johnfactotum@users.noreply.github.com> -Build-Depends: debhelper-compat(=10), +Build-Depends: debhelper-compat(>=13), gettext, meson (>= 0.59), pkg-config, From a320cc85c2b8ac058b03699d8d6bc36e2a85f122 Mon Sep 17 00:00:00 2001 From: John Factotum <50942278+johnfactotum@users.noreply.github.com> Date: Tue, 14 Nov 2023 01:52:48 +0000 Subject: [PATCH 3/6] Update deps --- .github/workflows/deb.yml | 2 +- debian/control | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/deb.yml b/.github/workflows/deb.yml index 1e5199ad..d49fbedc 100644 --- a/.github/workflows/deb.yml +++ b/.github/workflows/deb.yml @@ -25,7 +25,7 @@ jobs: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v2 - - run: sudo apt install build-essential debhelper meson gettext pkg-config libglib2.0-dev gjs appstream + - run: sudo apt install build-essential debhelper meson gettext gjs appstream - run: dpkg-buildpackage -us -uc -nc - run: mv ../*.deb . - uses: actions/upload-artifact@v2 diff --git a/debian/control b/debian/control index 119cd95d..2479934b 100644 --- a/debian/control +++ b/debian/control @@ -2,16 +2,9 @@ Source: foliate Section: gnome Priority: optional Maintainer: John Factotum <50942278+johnfactotum@users.noreply.github.com> -Build-Depends: debhelper-compat(>=13), +Build-Depends: debhelper-compat(=13), gettext, meson (>= 0.59), - pkg-config, - libglib2.0-dev (>= 2.54), - libgjs-dev, - libgtk-4-dev, - libadwaita-1-dev, - libwebkitgtk-6.0-dev, - desktop-file-utils, appstream Standards-Version: 4.5.0 Rules-Requires-Root: no From c95d3ebf13ed55b4e4161e3fece2428046436ff8 Mon Sep 17 00:00:00 2001 From: John Factotum <50942278+johnfactotum@users.noreply.github.com> Date: Thu, 2 May 2024 11:17:39 +0800 Subject: [PATCH 4/6] Revert "Update deps" This reverts commit a320cc85c2b8ac058b03699d8d6bc36e2a85f122. --- .github/workflows/deb.yml | 2 +- debian/control | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deb.yml b/.github/workflows/deb.yml index d49fbedc..1e5199ad 100644 --- a/.github/workflows/deb.yml +++ b/.github/workflows/deb.yml @@ -25,7 +25,7 @@ jobs: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v2 - - run: sudo apt install build-essential debhelper meson gettext gjs appstream + - run: sudo apt install build-essential debhelper meson gettext pkg-config libglib2.0-dev gjs appstream - run: dpkg-buildpackage -us -uc -nc - run: mv ../*.deb . - uses: actions/upload-artifact@v2 diff --git a/debian/control b/debian/control index 2479934b..119cd95d 100644 --- a/debian/control +++ b/debian/control @@ -2,9 +2,16 @@ Source: foliate Section: gnome Priority: optional Maintainer: John Factotum <50942278+johnfactotum@users.noreply.github.com> -Build-Depends: debhelper-compat(=13), +Build-Depends: debhelper-compat(>=13), gettext, meson (>= 0.59), + pkg-config, + libglib2.0-dev (>= 2.54), + libgjs-dev, + libgtk-4-dev, + libadwaita-1-dev, + libwebkitgtk-6.0-dev, + desktop-file-utils, appstream Standards-Version: 4.5.0 Rules-Requires-Root: no From b9b6378f924113ec4004dfc81f6842e539a2f32e Mon Sep 17 00:00:00 2001 From: John Factotum <50942278+johnfactotum@users.noreply.github.com> Date: Thu, 2 May 2024 11:22:53 +0800 Subject: [PATCH 5/6] Use Ubuntu 24.04 --- .github/workflows/deb.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deb.yml b/.github/workflows/deb.yml index 1e5199ad..67afecb0 100644 --- a/.github/workflows/deb.yml +++ b/.github/workflows/deb.yml @@ -18,7 +18,7 @@ jobs: # This workflow contains a single job called "build" build: # The type of runner that the job will run on - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 # Steps represent a sequence of tasks that will be executed as part of the job steps: From 12bb9e949747bfdda634de745ef58726674a06db Mon Sep 17 00:00:00 2001 From: Archisman Panigrahi Date: Wed, 28 Aug 2024 16:37:10 -0400 Subject: [PATCH 6/6] Fix GitHub action for deb file (#1383) * Update dependencies for github action for deb package * debhelper-compat does not work with >= * pull submodules * Update upload-artifact version --- .github/workflows/deb.yml | 6 ++++-- debian/control | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deb.yml b/.github/workflows/deb.yml index 67afecb0..cf1ad630 100644 --- a/.github/workflows/deb.yml +++ b/.github/workflows/deb.yml @@ -24,11 +24,13 @@ jobs: steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v2 + with: + submodules: 'true' - - run: sudo apt install build-essential debhelper meson gettext pkg-config libglib2.0-dev gjs appstream + - run: sudo apt install build-essential debhelper meson gettext pkg-config libglib2.0-dev gjs appstream libgjs-dev libgtk-4-dev libadwaita-1-dev libwebkitgtk-6.0-dev desktop-file-utils - run: dpkg-buildpackage -us -uc -nc - run: mv ../*.deb . - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: name: Debian Package path: "*.deb" diff --git a/debian/control b/debian/control index 119cd95d..8a1d805b 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: foliate Section: gnome Priority: optional Maintainer: John Factotum <50942278+johnfactotum@users.noreply.github.com> -Build-Depends: debhelper-compat(>=13), +Build-Depends: debhelper-compat(=13), gettext, meson (>= 0.59), pkg-config,