Skip to content

Revert "Use an older version of imagemagick for mac ci" #1427

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
williamchange wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Revert "Use an older version of imagemagick for mac ci" #1427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/create-dmg-bg.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ roundrect="roundrectangle -60,-11 60,11, 3,3"
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'"
arrow_pos="180,100"

convert $IMAGE_PATH \
magick $IMAGE_PATH \
-resize x330 \
-gravity center -crop 540x+0+0 \
-evaluate multiply "$bg_opacity" \
Expand All @@ -27,4 +27,4 @@ convert $IMAGE_PATH \
-fill white -draw "fill-opacity $rect_opacity translate $rect_pos_a $roundrect" \
-fill white -draw "fill-opacity $rect_opacity translate $rect_pos_b $roundrect" \
\( -size 800x800 xc:none -fill black -draw "translate $arrow_pos path $arrow" -scale 300x -blur 0x$arrow_shadow_blur \) -composite \
\( -size 800x800 xc:none -fill white -draw "translate $arrow_pos path $arrow" -scale 300x \) -composite $BG_OUT_PATH
\( -size 800x800 xc:none -fill white -draw "translate $arrow_pos path $arrow" -scale 300x \) -composite $BG_OUT_PATH
2 changes: 1 addition & 1 deletion .github/workflows/dev-desktop-builds.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ jobs:
codesign -s "Rodolphe Suescun" --force --options runtime --timestamp --deep "./build/mac/Material Maker.app"
- name: Create DMG archive 🔧
run: |
brew update && brew install imagemagick@6
brew update && brew install imagemagick
cp ./.github/workflows/create-dmg-bg.sh .
chmod +x create-dmg-bg.sh
./create-dmg-bg.sh ./splash_screen/backgrounds/pavel_oliva_vintage_luggage.png ./bg.png
Expand Down