From 8ab92872ad6418bb064bca1a56e5b9b400b77388 Mon Sep 17 00:00:00 2001
From: icex2 <djh.icex2@gmail.com>
Date: Tue, 28 Dec 2021 23:41:37 +0100
Subject: [PATCH] Improve debugability for inline scripts in ci pipeline

Instead of a single big block of code which only shows up as a
single command executed, have each command on a separate "line"
so they show up on debug output. If one line fails, it's easier
to tell which one failed
---
 .gitlab-ci.yml | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 92e6468..0db767a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -62,7 +62,7 @@ upload-package-registry:
       else
         version="${CI_COMMIT_SHORT_SHA}"
       fi
-
+    - |
       curl \
         --silent \
         --fail \
@@ -100,11 +100,9 @@ release-gitlab:
     refs:
       - tags
   script:
+    - version="$CI_COMMIT_TAG"
+    - release_message="$(scripts/ci/create-release-message.sh "${version}" < CHANGELOG.md)"
     - |
-      version="$CI_COMMIT_TAG"
-
-      release_message="$(scripts/ci/create-release-message.sh "${version}" < CHANGELOG.md)"
-
       release-cli create \
         --name "bemanitools ${version}" \
         --description="${release_message}" \
@@ -118,18 +116,13 @@ release-pigstall:
     refs:
       - tags
   script:
+    - version="${CI_COMMIT_TAG}"
+    - changelog_excerpt="$(scripts/ci/create-release-message.sh "${version}" < CHANGELOG.md)"
+    - release_message="$(printf "bemanitools ${version} released\n${CI_TOOLS_URL}/bemanitools-v${version}.zip\n${changelog_excerpt}")"
+    - session="$(echo "$CI_PIGSTALL_SESSION_BASE64" | base64 -d)"
+    - data_prefix="$(echo "$CI_PIGSTALL_DATA_PREFIX_BASE64" | base64 -d)"
+    - link="$(echo "$CI_PIGSTALL_LINK_BASE64" | base64 -d)"
     - |
-      version="${CI_COMMIT_TAG}"
-
-      changelog_excerpt="$(scripts/ci/create-release-message.sh "${version}" < CHANGELOG.md)"
-
-      release_message="$(printf \
-        "bemanitools ${version} released\n${CI_TOOLS_URL}/bemanitools-v${version}.zip\n${changelog_excerpt}")"
-
-      session="$(echo "$CI_PIGSTALL_SESSION_BASE64" | base64 -d)"
-      data_prefix="$(echo "$CI_PIGSTALL_DATA_PREFIX_BASE64" | base64 -d)"
-      link="$(echo "$CI_PIGSTALL_LINK_BASE64" | base64 -d)"
-
       curl \
         --silent \
         --fail \