Skip to content

Commit 4e1c1d4

Browse files
Fix yaml bug in linux pack
1 parent fd8eac1 commit 4e1c1d4

File tree

1 file changed

+23
-74
lines changed

1 file changed

+23
-74
lines changed

.github/workflows/Linux-pack.yml

+23-74
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ on:
55
branches:
66
- master
77
paths-ignore:
8-
- 'README.md'
9-
- 'LICENSE'
8+
- "README.md"
9+
- "LICENSE"
1010

1111
pull_request:
1212
paths-ignore:
13-
- 'README.md'
14-
- 'LICENSE'
13+
- "README.md"
14+
- "LICENSE"
1515

1616
env:
1717
PRODUCT: flameshot
@@ -32,55 +32,15 @@ jobs:
3232
fail-fast: false
3333
matrix:
3434
dist:
35-
- {
36-
name: debian-10,
37-
os: debian,
38-
symbol: buster,
39-
arch: amd64
40-
}
41-
- {
42-
name: debian-10,
43-
os: debian,
44-
symbol: buster,
45-
arch: arm64
46-
}
47-
- {
48-
name: debian-10,
49-
os: debian,
50-
symbol: buster,
51-
arch: armhf
52-
}
53-
- {
54-
name: debian-11,
55-
os: debian,
56-
symbol: bullseye,
57-
arch: amd64
58-
}
59-
- {
60-
name: debian-11,
61-
os: debian,
62-
symbol: bullseye,
63-
arch: arm64
64-
}
65-
- {
66-
name: debian-11,
67-
os: debian,
68-
symbol: bullseye,
69-
arch: armhf
70-
}
71-
- {
72-
name: ubuntu-20.04,
73-
os: ubuntu,
74-
symbol: focal,
75-
arch: amd64
76-
}
77-
- {
78-
name: ubuntu-22.04,
79-
os: ubuntu,
80-
symbol: jammy,
81-
arch: amd64
82-
}
83-
35+
- { name: debian-10, os: debian, symbol: buster, arch: amd64 }
36+
- { name: debian-10, os: debian, symbol: buster, arch: arm64 }
37+
- { name: debian-10, os: debian, symbol: buster, arch: armhf }
38+
- { name: debian-11, os: debian, symbol: bullseye, arch: amd64 }
39+
- { name: debian-11, os: debian, symbol: bullseye, arch: arm64 }
40+
- { name: debian-11, os: debian, symbol: bullseye, arch: armhf }
41+
- { name: ubuntu-20.04, os: ubuntu, symbol: focal, arch: amd64 }
42+
- { name: ubuntu-22.04, os: ubuntu, symbol: jammy, arch: amd64 }
43+
8444
steps:
8545
- name: Enable Docker Experimental Features
8646
run: |
@@ -219,23 +179,13 @@ jobs:
219179
fail-fast: false
220180
matrix:
221181
dist:
222-
- {
223-
name: fedora-35,
224-
os: fedora,
225-
symbol: 35,
226-
arch: x86_64
227-
}
228-
- {
229-
name: fedora-36,
230-
os: fedora,
231-
symbol: 36,
232-
arch: x86_64
233-
}
182+
- { name: fedora-35, os: fedora, symbol: 35, arch: x86_64 }
183+
- { name: fedora-36, os: fedora, symbol: 36, arch: x86_64 }
234184
- {
235185
name: opensuse-leap-15.2,
236186
os: opensuse-leap,
237187
symbol: 15.2,
238-
arch: x86_64
188+
arch: x86_64,
239189
}
240190
steps:
241191
- name: Checkout Source code
@@ -326,7 +276,7 @@ jobs:
326276
path: |
327277
${{ github.workspace }}/build/${{ env.PRODUCT }}-*-lp${{ matrix.dist.symbol }}.${{ matrix.dist.arch }}.rpm
328278
${{ github.workspace }}/build/${{ env.PRODUCT }}-*-lp${{ matrix.dist.symbol }}.${{ matrix.dist.arch }}.rpm.sha256sum
329-
appimage-pack:
279+
appimage-pack:
330280
name: Build appimage on ${{ matrix.config.name }}
331281
runs-on: ubuntu-22.04
332282
strategy:
@@ -338,7 +288,7 @@ jobs:
338288
os: ubuntu,
339289
symbol: focal,
340290
arch: amd64,
341-
image_repo: flameshotorg/ci-building-images
291+
image_repo: flameshotorg/ci-building-images,
342292
}
343293
container:
344294
image: ${{ matrix.config.image_repo }}:${{ matrix.config.os }}-${{ matrix.config.symbol }}
@@ -400,9 +350,9 @@ jobs:
400350
jq
401351
402352
- name: Get go-appimage tool
403-
# Will not use linuxdeployqt anymore, because it suopprts currently still-supported mainstream distribution,
404-
# which is glibc 2.23. For more information, please see https://github.com/probonopd/linuxdeployqt/issues/340.
405-
# Will try new tool https://github.com/probonopd/go-appimage written in golang by probonopd.
353+
# Will not use linuxdeployqt anymore, because it suopprts currently still-supported mainstream distribution,
354+
# which is glibc 2.23. For more information, please see https://github.com/probonopd/linuxdeployqt/issues/340.
355+
# Will try new tool https://github.com/probonopd/go-appimage written in golang by probonopd.
406356
run: |
407357
wget $(curl https://api.github.com/repos/probonopd/go-appimage/releases | jq -r '.[] | select(.tag_name == "continuous") | .assets[] | select((.name | endswith("x86_64.AppImage")) and (.name | contains("appimagetool"))) | .browser_download_url') -O appimagetool
408358
@@ -420,7 +370,7 @@ jobs:
420370
make -j$(nproc) DESTDIR=${APPIMAGE_DST_PATH} install
421371
422372
$GITHUB_WORKSPACE/appimagetool -s deploy "${APPIMAGE_DST_PATH}/usr/share/applications/org.flameshot.Flameshot.desktop"
423-
373+
424374
mkdir -p ${APPIMAGE_DST_PATH}/usr/plugins/platforminputcontexts
425375
cp \
426376
/usr/lib/x86_64-linux-gnu/qt5/plugins/platforminputcontexts/libfcitxplatforminputcontextplugin.so \
@@ -440,7 +390,6 @@ jobs:
440390
VERSION=${VERSION} $GITHUB_WORKSPACE/appimagetool "${APPIMAGE_DST_PATH}"
441391
mv $GITHUB_WORKSPACE/Flameshot-${VERSION}-x86_64.AppImage $GITHUB_WORKSPACE/Flameshot-${VERSION}.x86_64.AppImage
442392
443-
444393
- name: SHA256Sum of appimage package(daily build)
445394
run: |
446395
cd "$GITHUB_WORKSPACE/" || { >&2 echo "Cannot cd to '$GITHUB_WORKSPACE/'!"; exit 11 ; }
@@ -557,7 +506,7 @@ jobs:
557506
- name: Packaging snap
558507
uses: snapcore/action-build@v1
559508
id: snapcraft
560-
with:
509+
with:
561510
snapcraft-args: --enable-experimental-extensions
562511
- name: Rename snap name
563512
shell: bash

0 commit comments

Comments
 (0)