Skip to content

Commit 56ff36a

Browse files
authored
Qt 6 - DEB/RPM Linux packaging (flameshot-org#4029)
* Deb packaging * Deb packaging * Deb packaging * Update readme to Qt 6 (except Fedora yet) * RPM * Deb suggests * Deb * RPM * RPM * RPM * Jammy patch * Test jammy patch * Revert "Jammy patch" This reverts commit 6401966. * Revert "Test jammy patch" This reverts commit bebff73. * Deb control: Alternative Build-Depends * Fix RPM for KDSingleApplication * Add build dependency libgl-dev explicit for Jammy (it is included for newer versions automatically) * Add build dependency qt6-l10n-tools explicit for Jammy (it is included for newer versions automatically) * Update DEB rules removing not needed files like in RPM .spec (663a056) * DEB rules: Remove empty folders from package * Add kguiaddon for Fedora and Arch * DEB rules: Remove empty lib folder from package * DEB rules: Remove include and lib folder from package * Add missing dependencies
1 parent 2366245 commit 56ff36a

8 files changed

Lines changed: 340 additions & 267 deletions

File tree

.github/workflows/Linux-arm-pack.yml

Lines changed: 34 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ jobs:
3030
fail-fast: false
3131
matrix:
3232
dist:
33-
- {
34-
name: debian-11,
35-
os: debian,
36-
symbol: bullseye,
37-
arch: armhf
38-
}
33+
# - {
34+
# name: debian-11,
35+
# os: debian,
36+
# symbol: bullseye,
37+
# arch: armhf
38+
# }
3939
- {
4040
name: debian-12,
4141
os: debian,
@@ -52,25 +52,42 @@ jobs:
5252
name: ubuntu-22.04,
5353
os: ubuntu,
5454
symbol: jammy,
55-
arch: amd64
55+
arch: arm64
56+
}
57+
- {
58+
name: ubuntu-24.04,
59+
os: ubuntu,
60+
symbol: noble,
61+
arch: arm64
5662
}
63+
5764
steps:
58-
- name: Set up Docker Buildx
59-
uses: docker/setup-buildx-action@v3
6065
- name: Set up QEMU
6166
uses: docker/setup-qemu-action@v3
67+
68+
- name: Set up Docker Buildx
69+
uses: docker/setup-buildx-action@v3
70+
6271
- name: Checkout Source code
6372
if: github.event_name == 'push'
6473
uses: actions/checkout@v4
6574
with:
6675
fetch-depth: 0
67-
ref: master
76+
# ref: master
77+
6878
- name: Checkout Source code
6979
if: github.event_name == 'pull_request'
7080
uses: actions/checkout@v4
7181
with:
7282
fetch-depth: 0
7383
ref: ${{ github.event.pull_request.head.sha }}
84+
85+
- name: Checkout Source code
86+
if: github.event_name == 'workflow_dispatch'
87+
uses: actions/checkout@v4
88+
with:
89+
ref: ${{ github.sha }}
90+
7491
- name: Set env & Print flameshot version
7592
shell: bash
7693
run: |
@@ -82,15 +99,19 @@ jobs:
8299
echo ${last_committed_tag:1}
83100
echo "Details: ${ver_info}"
84101
echo "================================"
85-
echo "VERSION=${last_committed_tag:1}" >> $GITHUB_ENV
102+
# This will allow to build pre-preleases without git tag
103+
# echo "VERSION=${last_committed_tag:1}" >> $GITHUB_ENV
104+
echo "VERSION=$(cat CMakeLists.txt |grep 'set.*(.*FLAMESHOT_VERSION' | sed 's/[^0-9.]*//' |sed 's/)//g')" >> $GITHUB_ENV
86105
echo "VER_INFO=${ver_info}" >> $GITHUB_ENV
106+
87107
- name: Get packpack tool
88108
uses: actions/checkout@v4
89109
with:
90110
repository: ${{ env.PACKPACK_REPO }}
91111
path: tools
92112
ref: multiarch
93113
set-safe-directory: $GITHUB_WORKSPACE/tools
114+
94115
- name: Packaging on ${{ matrix.dist.name }} ${{ matrix.dist.arch }}
95116
env:
96117
OS: ${{ matrix.dist.os }}
@@ -114,10 +135,12 @@ jobs:
114135
cp -r $GITHUB_WORKSPACE/packaging/debian $GITHUB_WORKSPACE
115136
bash $GITHUB_WORKSPACE/tools/packpack
116137
mv $GITHUB_WORKSPACE/build/${PRODUCT}_${VERSION}-${RELEASE}_${{ matrix.dist.arch }}.deb $GITHUB_WORKSPACE/build/${PRODUCT}-${VERSION}-${RELEASE}.${{ matrix.dist.name }}.${{ matrix.dist.arch }}.deb
138+
117139
- name: SHA256Sum of ${{ matrix.dist.name }} ${{ matrix.dist.arch }} package
118140
run: |
119141
cd "$GITHUB_WORKSPACE/build/" || { >&2 echo "Cannot cd to '$GITHUB_WORKSPACE/build/'!"; exit 11 ; }
120142
sha256sum ${PRODUCT}-${VERSION}-${RELEASE}.${{ matrix.dist.name }}.${{ matrix.dist.arch }}.deb | tee ${PRODUCT}-${VERSION}-${RELEASE}.${{ matrix.dist.name }}.${{ matrix.dist.arch }}.deb.sha256sum
143+
121144
- name: Artifact Upload
122145
uses: actions/upload-artifact@v4
123146
with:
@@ -126,5 +149,3 @@ jobs:
126149
${{ github.workspace }}/build/${{ env.PRODUCT }}-*-${{ env.RELEASE }}.${{ matrix.dist.name }}.${{ matrix.dist.arch }}.deb
127150
${{ github.workspace }}/build/${{ env.PRODUCT }}-*-${{ env.RELEASE }}.${{ matrix.dist.name }}.${{ matrix.dist.arch }}.deb.sha256sum
128151
overwrite: true
129-
130-

0 commit comments

Comments
 (0)