Skip to content

Commit

Permalink
refactor: Drop ImageMagick SDK
Browse files Browse the repository at this point in the history
  • Loading branch information
pojntfx committed Aug 25, 2023
1 parent cf2ec66 commit e176c35
Show file tree
Hide file tree
Showing 17 changed files with 6 additions and 38 deletions.
14 changes: 4 additions & 10 deletions Hydrunfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,10 @@ EOT

# Install Flatpak dependencies
flatpak remote-add --if-not-exists 'flathub' 'https://flathub.org/repo/flathub.flatpakrepo'

# Install pre-build SDKs
flatpak install -y 'flathub' "org.gnome.Platform//44" "org.gnome.Sdk//44" "org.freedesktop.Sdk.Extension.golang//21.08"

# Build SDK and export to repo
flatpak-builder -y --gpg-sign="${PGP_KEY_ID}" --repo='/dst/repo' --force-clean --user --install "build-dir" "org.freedesktop.Sdk.Extension.ImageMagick.yaml"

# Build app and export to repo
# Build repo
flatpak-builder -y --gpg-sign="${PGP_KEY_ID}" --repo='/dst/repo' --force-clean "build-dir" "com.pojtinger.felicitas.vintangle.yaml"

# Export `.flatpak` to out dir
flatpak --gpg-sign="${PGP_KEY_ID}" build-bundle '/dst/repo' "/dst/bundle/com.pojtinger.felicitas.vintangle.flatpak" "com.pojtinger.felicitas.vintangle"

echo "[Flatpak Repo]
Title=Vintangle Flatpak repo
Url=https://pojntfx.github.io/vintangle
Expand All @@ -43,5 +34,8 @@ Description=Flatpaks for Vintangle
GPGKey=$(base64 -w 0 /tmp/repo.asc)
" >/dst/repo/vintangle.flatpakrepo

# Export bundle
flatpak --gpg-sign="${PGP_KEY_ID}" build-bundle '/dst/repo' "/dst/bundle/com.pojtinger.felicitas.vintangle.flatpak" "com.pojtinger.felicitas.vintangle"

exit 0
fi
6 changes: 2 additions & 4 deletions com.pojtinger.felicitas.vintangle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ runtime-version: "44"
sdk: org.gnome.Sdk
sdk-extensions:
- org.freedesktop.Sdk.Extension.golang
- org.freedesktop.Sdk.Extension.ImageMagick
command: com.pojtinger.felicitas.vintangle
finish-args:
- --socket=session-bus
Expand All @@ -20,14 +19,13 @@ modules:
buildsystem: simple
build-commands:
- git config --global --add safe.directory '*'
- GOPROXY='https://proxy.golang.org,direct' sh -c '. /usr/lib/sdk/golang/enable.sh && . /usr/lib/sdk/node16/enable.sh && go generate ./...'
- GOPROXY='https://proxy.golang.org,direct' sh -c '. /usr/lib/sdk/golang/enable.sh && go generate ./...'
- . /usr/lib/sdk/golang/enable.sh && export GOPROXY='https://proxy.golang.org,direct' && go build -o out/com.pojtinger.felicitas.vintangle .
- install -D out/com.pojtinger.felicitas.vintangle /app/bin/com.pojtinger.felicitas.vintangle
- . /usr/lib/sdk/ImageMagick/enable.sh && for icon in 16x16 22x22 24x24 32x32 36x36 48x48 64x64 72x72 96x96 128x128 192x192 256x256 512x512; do convert icon.png -resize ${icon} out/icon-${icon}.png; done
- desktop-file-install --dir=/app/share/applications com.pojtinger.felicitas.vintangle.desktop
- appstream-util validate-relax com.pojtinger.felicitas.vintangle.metainfo.xml
- install -D -m 0644 com.pojtinger.felicitas.vintangle.metainfo.xml /app/share/metainfo/com.pojtinger.felicitas.vintangle.metainfo.xml
- for icon in 16x16 22x22 24x24 32x32 36x36 48x48 64x64 72x72 96x96 128x128 192x192 256x256 512x512; do install -D -m 0644 out/icon-${icon}.png /app/share/icons/hicolor/${icon}/apps/com.pojtinger.felicitas.vintangle.png; done
- for icon in 16x16 22x22 24x24 32x32 36x36 48x48 64x64 72x72 96x96 128x128 192x192 256x256 512x512; do install -D -m 0644 docs/icon-${icon}.png /app/share/icons/hicolor/${icon}/apps/com.pojtinger.felicitas.vintangle.png; done
build-options:
build-args:
- "--share=network"
Expand Down
Binary file added docs/icon-128x128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/icon-16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/icon-192x192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/icon-22x22.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/icon-24x24.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/icon-256x256.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/icon-32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/icon-36x36.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/icon-48x48.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/icon-512x512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/icon-64x64.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/icon-72x72.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/icon-96x96.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/logo-readme.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 0 additions & 24 deletions org.freedesktop.Sdk.Extension.ImageMagick.yaml

This file was deleted.

0 comments on commit e176c35

Please sign in to comment.