Post-1.4 Release CI Fixes

.cdb.json.template

@@ -1,9 +1,9 @@
 {
-    "type": "MOD",
+    "type": "TXP",
     "title": "RPG16",
 SHORT_DESCRIPTION
     "tags": [ "16px" ],
-    "media_license": "CC BY-SA 4.0",
+    "media_license": "CC-BY-SA-4.0",
     "repo": "https://gitlab.com/Df458/rpg16",
     "website": "https://www.huguesross.net",
     "issue_tracker": "https://gitlab.com/Df458/rpg16/issues",

.gitlab-ci.yml

@@ -1,5 +1,6 @@
 stages:
     - build
+    - optimize
     - package
 
 variables:
@@ -17,6 +18,19 @@ build-textures:
         paths:
             - "rpg16/"
 
+optimize:
+    stage: optimize
+    only:
+        - tags
+    script:
+        - "find ${EXPORT_DIR} -name '*.png' | xargs optipng -o5 -fix"
+
+    artifacts:
+        paths:
+            - "rpg16/"
+    dependencies:
+        - build-textures
+
 stamp:
     stage: package
     only:
@@ -28,17 +42,4 @@ stamp:
         paths:
             - "rpg16/"
     dependencies:
-        - build-textures
-
-optimize:
-    stage: package
-    only:
-        - tags
-    script:
-        - "find ${EXPORT_DIR} -name '*.png' | xargs optipng -o5 -fix"
-
-    artifacts:
-        paths:
-            - "rpg16/"
-    dependencies:
-        - build-textures
+        - optimize

cdb_json.awk

@@ -4,7 +4,7 @@ BEGIN {
 }
 
 /^SHORT_DESCRIPTION/ {
-    print "    \"short_description\": \"" short_description "\"";
+    print "    \"short_description\": \"" short_description "\",";
 }
 
 /^LONG_DESCRIPTION/ {

stamp.sh

@@ -20,9 +20,6 @@ convert "${EXPORT_DIR}/screenshot.png" \
     -gravity southeast -fill "#b9b5c5" -font "DejaVu-Serif" -annotate 0 "${1}"\
     "${EXPORT_DIR}/screenshot.png" || { echo "Failed to stamp versioning info onto ${EXPORT_DIR}/screenshot.png"; exit 1; }
 
-# Stamp the provided version number into the texture_pack.conf
-echo "release = ${1}" >> "${EXPORT_DIR}/texture_pack.conf"
-
 # Generate an escaped long description for .cdb.json
 export SHORT_DESCRIPTION=`awk -f "short_description.awk" "README.md"`
 export LONG_DESCRIPTION=`awk -f "long_description.awk" "README.md"`