Skip to content

Commit 2b0fdb1

Browse files
authored
Merge pull request #1380 from williamchange/test-ci-imagemagick-6
Use an older version of imagemagick for mac ci
2 parents 7e0d9fb + 29db564 commit 2b0fdb1

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

.github/workflows/create-dmg-bg.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ roundrect="roundrectangle -60,-11 60,11, 3,3"
1818
arrow="'M247.795861,184.47071 L290.200287,218.009412 C293.232498,220.407661 293.746425,224.809919 291.348175,227.84213 C291.011358,228.267982 290.626139,228.653201 290.200287,228.990018 L247.795497,262.529007 C244.763287,264.927257 240.361029,264.413331 237.962779,261.38112 C236.985055,260.144941 236.453122,258.614978 236.453082,257.038881 L236.452673,245.04637 C236.452575,241.180419 233.318555,238.046509 229.452604,238.046546 L161.141914,238.047178 C157.356462,238.047215 154.272786,235.042462 154.145907,231.287896 L154.141845,231.047178 L154.141845,215.952251 C154.141845,212.086285 157.275948,208.952289 161.141914,208.952251 L229.453446,208.951443 C233.319412,208.951405 236.453377,205.81741 236.453377,201.951443 L236.453446,189.961013 C236.453446,186.095019 239.587453,182.961013 243.453446,182.961013 C245.029604,182.961013 246.559635,183.492948 247.795861,184.47071 Z'"
1919
arrow_pos="180,100"
2020

21-
magick $IMAGE_PATH \
21+
convert $IMAGE_PATH \
2222
-resize x330 \
2323
-gravity center -crop 540x+0+0 \
2424
-evaluate multiply "$bg_opacity" \
@@ -27,4 +27,4 @@ magick $IMAGE_PATH \
2727
-fill white -draw "fill-opacity $rect_opacity translate $rect_pos_a $roundrect" \
2828
-fill white -draw "fill-opacity $rect_opacity translate $rect_pos_b $roundrect" \
2929
\( -size 800x800 xc:none -fill black -draw "translate $arrow_pos path $arrow" -scale 300x -blur 0x$arrow_shadow_blur \) -composite \
30-
\( -size 800x800 xc:none -fill white -draw "translate $arrow_pos path $arrow" -scale 300x \) -composite $BG_OUT_PATH
30+
\( -size 800x800 xc:none -fill white -draw "translate $arrow_pos path $arrow" -scale 300x \) -composite $BG_OUT_PATH

.github/workflows/dev-desktop-builds.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ jobs:
196196
codesign -s "Rodolphe Suescun" --force --options runtime --timestamp --deep "./build/mac/Material Maker.app"
197197
- name: Create DMG archive 🔧
198198
run: |
199-
brew update && brew install imagemagick
199+
brew update && brew install imagemagick@6
200200
cp ./.github/workflows/create-dmg-bg.sh .
201201
chmod +x create-dmg-bg.sh
202202
./create-dmg-bg.sh ./splash_screen/backgrounds/pavel_oliva_vintage_luggage.png ./bg.png

0 commit comments

Comments
 (0)