Skip to content

Commit 1efa8b8

Browse files
committed
AppImage binaries need FUSE which is not present in GitHub runners
1 parent fcd4d1e commit 1efa8b8

File tree

7 files changed

+7
-95
lines changed

7 files changed

+7
-95
lines changed

.github/workflows/main.yml

+4-27
Original file line numberDiff line numberDiff line change
@@ -42,39 +42,16 @@ jobs:
4242
id: pages
4343
uses: actions/configure-pages@v5
4444

45-
- name: Fetch ImageMagick ETag
46-
id: fetch-magick-etag
47-
run: |
48-
echo "etag=$(./fetch-magick-etag.sh)" >> "$GITHUB_OUTPUT"
49-
50-
- name: Restore ImageMagick
51-
id: restore-magick
52-
uses: actions/cache@v4
53-
with:
54-
path: |
55-
bin/magick
56-
bin/magick-etag
57-
key: magick-${{ steps.fetch-magick-etag.outputs.etag }}
58-
59-
- name: Fetch Inkscape version
60-
id: fetch-inkscape-version
61-
run: |
62-
echo "version=$(./fetch-inkscape-version.sh)" >> "$GITHUB_OUTPUT"
63-
64-
- name: Restore Inkscape
65-
id: restore-inkscape
66-
uses: actions/cache@v4
45+
- uses: awalsh128/cache-apt-pkgs-action@v1
6746
with:
68-
path: |
69-
bin/inkscape
70-
bin/inkscape-version
71-
key: inkscape-${{ steps.fetch-inkscape-version.outputs.version }}
47+
packages: inkscape imagemagick
48+
version: 1
7249

7350
- name: Build
7451
env:
7552
JEKYLL_ENV: production
7653
run: |
77-
./build.sh --fetch-deps --baseurl "${{ steps.pages.outputs.base_path }}"
54+
./build.sh --baseurl "${{ steps.pages.outputs.base_path }}"
7855
7956
- name: Upload artifact
8057
uses: actions/upload-pages-artifact@v3

build.sh

-19
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
11
#!/usr/bin/env bash
22

3-
fetch_deps=0
43
watch=0
54
no_jekyll=0
65

76
while [[ $# -gt 0 ]]; do
87
case "$1" in
9-
-F|--fetch-deps)
10-
fetch_deps=1
11-
shift
12-
;;
138
-w|--watch)
149
watch=1
1510
shift
@@ -26,20 +21,6 @@ done
2621

2722
set -e
2823

29-
if [[ fetch_deps -ne 0 ]]; then
30-
(
31-
set -e
32-
mkdir -p bin
33-
cd bin
34-
../fetch-inkscape.sh
35-
../fetch-magick.sh
36-
)
37-
fi
38-
39-
if [[ -d bin ]]; then
40-
export PATH="$(realpath bin):$PATH"
41-
fi
42-
4324
echo "Generating images..."
4425
./gen-icon.sh assets/opengraph-*.svg assets/twitter-*.svg &
4526
asset_job=$!

fetch-inkscape-version.sh

-7
This file was deleted.

fetch-inkscape.sh

-23
This file was deleted.

fetch-magick-etag.sh

-3
This file was deleted.

fetch-magick.sh

-13
This file was deleted.

gen-icon.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ if [[ inkscape -ne 0 ]]; then
7676
exit 1
7777
fi
7878

79-
command -v magick > /dev/null; magick=$?
79+
command -v convert > /dev/null; magick=$?
8080

8181
if [[ magick -ne 0 ]]; then
82-
echo $'Cannot find \'magick\' command. Make sure ImageMagick is installed and reachable from the current working directory. See: https://www.imagemagick.org' >&2
82+
echo $'Cannot find \'convert\' command. Make sure ImageMagick is installed and reachable from the current working directory. See: https://www.imagemagick.org' >&2
8383
exit 1
8484
fi
8585

@@ -133,7 +133,7 @@ for f in "$@"; do
133133

134134
if (( ${#pngs[@]} > 0 )); then
135135
ico="$name.g.ico"
136-
magick -background none "${pngs[@]}" "$ico"
136+
convert -background none "${pngs[@]}" "$ico"
137137
fi
138138

139139
if (( apple != 0 )); then

0 commit comments

Comments
 (0)