From 1b56fa5833c5c5fbb57a065137400cea55a19fab Mon Sep 17 00:00:00 2001 From: Bryan Gerlach Date: Wed, 26 Feb 2025 16:10:48 -0600 Subject: [PATCH] try fixing imagamagick issues --- .github/workflows/generator-android.yml | 10 +++++----- .github/workflows/generator-linux.yml | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/generator-android.yml b/.github/workflows/generator-android.yml index c3be9d8..0a87ddd 100644 --- a/.github/workflows/generator-android.yml +++ b/.github/workflows/generator-android.yml @@ -483,9 +483,9 @@ jobs: env: JAVA_HOME: /usr/lib/jvm/java-17-openjdk-amd64 run: | - echo "MAGICK_MEMORY_LIMIT=512MiB" >> $GITHUB_ENV - echo "MAGICK_MAP_LIMIT=256MiB" >> $GITHUB_ENV - echo "MAGICK_DISK_LIMIT=1GiB" >> $GITHUB_ENV + echo "MAGICK_MEMORY_LIMIT=512MiB" >> $GITHUB_ENV || true + echo "MAGICK_MAP_LIMIT=256MiB" >> $GITHUB_ENV || true + echo "MAGICK_DISK_LIMIT=1GiB" >> $GITHUB_ENV || true export PATH=/usr/lib/jvm/java-17-openjdk-amd64/bin:$PATH # temporary use debug sign config sed -i "s/signingConfigs.release/signingConfigs.debug/g" ./flutter/android/app/build.gradle @@ -499,8 +499,8 @@ jobs: if [[ "${{ inputs.iconlink }}" != "false" ]]; then mv ./flutter/assets/icon.svg ./flutter/assets/icon.svg.bak convert ./res/icon.png ./flutter/assets/icon.svg - convert ./res/128x128.png -resize 200% ./flutter/assets/128x128@2x.png - convert ./res/icon.png ./res/scalable.svg + convert ./res/128x128.png -resize 200% ./flutter/assets/128x128@2x.png || true + cp ./flutter/assets/icon.svg ./res/scalable.svg fi # build flutter pushd flutter diff --git a/.github/workflows/generator-linux.yml b/.github/workflows/generator-linux.yml index 366bbf8..a2088f7 100644 --- a/.github/workflows/generator-linux.yml +++ b/.github/workflows/generator-linux.yml @@ -528,13 +528,13 @@ jobs: wget -O ./flutter/assets/logo.png ${{ fromJson(inputs.logolink).url }}/get_png?filename=${{ fromJson(inputs.logolink).file }}"&"uuid=${{ fromJson(inputs.logolink).uuid }} fi if [[ "${{ inputs.iconlink }}" != "false" ]]; then - echo "MAGICK_MEMORY_LIMIT=512MiB" >> $GITHUB_ENV - echo "MAGICK_MAP_LIMIT=256MiB" >> $GITHUB_ENV - echo "MAGICK_DISK_LIMIT=1GiB" >> $GITHUB_ENV + echo "MAGICK_MEMORY_LIMIT=512MiB" >> $GITHUB_ENV || true + echo "MAGICK_MAP_LIMIT=256MiB" >> $GITHUB_ENV || true + echo "MAGICK_DISK_LIMIT=1GiB" >> $GITHUB_ENV || true mv ./flutter/assets/icon.svg ./flutter/assets/icon.svg.bak convert ./res/icon.png ./flutter/assets/icon.svg - convert ./res/128x128.png -resize 200% ./flutter/assets/128x128@2x.png - convert ./res/icon.png ./res/scalable.svg + convert ./res/128x128.png -resize 200% ./flutter/assets/128x128@2x.png || true + cp ./flutter/assets/icon.svg ./res/scalable.svg pushd ./flutter flutter pub get dart run flutter_launcher_icons