Skip to content

Commit c221f00

Browse files
committed
fix
1 parent c9354d4 commit c221f00

File tree

1 file changed

+24
-28
lines changed

1 file changed

+24
-28
lines changed

action.yml

Lines changed: 24 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -104,21 +104,21 @@ runs:
104104
- name: Install tools
105105
shell: bash
106106
run: |
107-
sudo apt-get install pandoc jq zip imagemagick -y -qq
107+
sudo apt-get -qq install pandoc jq zip imagemagick -y
108108
109109
- name: Configure ImageMagick
110110
shell: bash
111111
run: |
112-
sudo sed -i '/disable ghostscript format types/,+6d' /etc/ImageMagick-6/policy.xml
113-
sudo sed -i -E 's/name="memory" value=".+"/name="memory" value="8GiB"/g' /etc/ImageMagick-6/policy.xml
114-
sudo sed -i -E 's/name="map" value=".+"/name="map" value="8GiB"/g' /etc/ImageMagick-6/policy.xml
115-
sudo sed -i -E 's/name="area" value=".+"/name="area" value="8GiB"/g' /etc/ImageMagick-6/policy.xml
116-
sudo sed -i -E 's/name="disk" value=".+"/name="disk" value="8GiB"/g' /etc/ImageMagick-6/policy.xml
112+
sudo sed -n -i '/disable ghostscript format types/,+6d' /etc/ImageMagick-6/policy.xml
113+
sudo sed -n -i -E 's/name="memory" value=".+"/name="memory" value="8GiB"/g' /etc/ImageMagick-6/policy.xml
114+
sudo sed -n -i -E 's/name="map" value=".+"/name="map" value="8GiB"/g' /etc/ImageMagick-6/policy.xml
115+
sudo sed -n -i -E 's/name="area" value=".+"/name="area" value="8GiB"/g' /etc/ImageMagick-6/policy.xml
116+
sudo sed -n -i -E 's/name="disk" value=".+"/name="disk" value="8GiB"/g' /etc/ImageMagick-6/policy.xml
117117
118118
- name: Convert README.md to HTML
119119
shell: bash
120120
run: |
121-
pandoc $INPUT_README_PATH -o README.html
121+
pandoc $INPUT_README_PATH -o README.html --quiet
122122
readme_html_single_line=$(cat README.html | tr '\n' ' ')
123123
readme_encoded=$(echo -n "$readme_html_single_line" | jq -s -R -r @uri)
124124
echo "README_HTML=$(printf '%q' "$readme_encoded")" >> $GITHUB_ENV
@@ -127,33 +127,29 @@ runs:
127127
shell: bash
128128
run: |
129129
if [ -f "$INPUT_LOGO_PATH" ]; then
130-
echo "Logo found at $INPUT_LOGO_PATH"
131-
exit 1
132-
fi
133-
134-
if [ "$INPUT_IMEJIS_GENERATE_IMAGE" == "false" ]; then
135-
echo "No logo found at $INPUT_LOGO_PATH and IMEJIS_GENERATE_IMAGE is false. Downloading basic image."
130+
echo "Logo found at $INPUT_LOGO_PATH. Using existing logo."
131+
elif [ "$INPUT_IMEJIS_GENERATE_IMAGE" == "false" ]; then
132+
echo "No logo found at $INPUT_LOGO_PATH and imejisGenerateImage is false. Downloading basic image."
136133
text="$INPUT_PROJECT_NAME $INPUT_VERSION}"
137134
colour=${INPUT_BACKGROUND_COLOR//#/}
138135
139136
wget -O "$INPUT_LOGO_PATH" "https://dummyimage.com/$INPUT_IMAGE_SIZE/${colour}/ffffff&text=${text}"
140-
exit 1
141-
fi
142-
143-
echo "Downloading logo from imejis.io"
137+
else
138+
echo "Downloading logo from imejis.io"
144139
145-
printf -v JSON_DATA '
146-
{
147-
"project": "%s",
148-
"author": "%s",
149-
"version": "%s"
150-
}' "$INPUT_PROJECT_NAME" "$INPUT_PROJECT_AUTHOR" "$INPUT_VERSION"
140+
printf -v JSON_DATA '
141+
{
142+
"project": "%s",
143+
"author": "%s",
144+
"version": "%s"
145+
}' "$INPUT_PROJECT_NAME" "$INPUT_PROJECT_AUTHOR" "$INPUT_VERSION"
151146
152-
curl "https://api.imejis.io/api/designs/$INPUT_IMEJIS_DESIGN_ID" \
153-
--header "dma-api-key: $INPUT_IMEJIS_KEY" \
154-
--header 'Content-Type: application/json' \
155-
--data "$JSON_DATA" \
156-
--output "$INPUT_LOGO_PATH"
147+
curl "https://api.imejis.io/api/designs/$INPUT_IMEJIS_DESIGN_ID" \
148+
--header "dma-api-key: $INPUT_IMEJIS_KEY" \
149+
--header 'Content-Type: application/json' \
150+
--data "$JSON_DATA" \
151+
--output "$INPUT_LOGO_PATH"
152+
fi
157153
158154
- name: Resize images for mod.io
159155
shell: bash

0 commit comments

Comments
 (0)