From 6796c66f02cfc115f8f806f7ab4b8c4c4d3fb2a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Trevor=20Ba=C4=8Da?= <trevor.baca@gmail.com>
Date: Fri, 24 Jan 2025 16:28:21 -0500
Subject: [PATCH] Clean up GitHub Actions LilyPond installation (#1633)

---
 .github/workflows/main.yml | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a1e37ede2c..67393dd6bd 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -11,8 +11,8 @@ jobs:
     runs-on: ubuntu-latest
 
     strategy:
-      fail-fast: true
-      matrix: { python-version: ["3.12", "3.13"] }
+      matrix:
+        python-version: ["3.12", "3.13"]
 
     steps:
     - name: Check out repository
@@ -40,8 +40,8 @@ jobs:
       run: |
         export LILYPOND_VERSION=2.25.22
         echo "LILYPOND_VERSION=${LILYPOND_VERSION}" >> $GITHUB_ENV
-        echo "PATH=/tmp/lilypond-${LILYPOND_VERSION}/bin:/home/runner/bin:$PATH" \
-          >> $GITHUB_ENV
+        string="PATH=/tmp/lilypond-${LILYPOND_VERSION}/bin:/home/runner/bin:$PATH"
+        echo $string >> $GITHUB_ENV
         echo "PYTHONUNBUFFERED=TRUE" >> $GITHUB_ENV
 
     - name: Log environment variables
@@ -58,17 +58,12 @@ jobs:
         base_url="https://gitlab.com/lilypond/lilypond/-/releases"
         lilypond_url="${base_url}/v${LILYPOND_VERSION}/downloads/${lilypond_archive}"
         echo "Downloading LilyPond from: ${lilypond_url}"
-        cd /tmp || { echo "Failed to change directory to /tmp"; }
-        wget -q --tries=3 --timeout=30 ${lilypond_url} || \
-          { echo "Download failed after 3 attempts"; }
-        if [ ! -f "${lilypond_archive}" ]; then
-            echo "File download failed!" >&2
-        fi
+        cd /tmp
+        wget -q --tries=3 --timeout=30 ${lilypond_url}
+        test -f "${lilypond_archive}"
         checksum="3e837e811aaa72323863925f0a4b5bd1aff1ed9b997e6c70dbe5c008e47872e7"
         echo "${checksum}  ${lilypond_archive}" > checksum.txt
-        if ! sha256sum -c checksum.txt --status; then
-            echo "Checksum verification failed!" >&2
-        fi
+        sha256sum -c checksum.txt --status
         rm checksum.txt
         echo "Checksum verified successfully."
         tar -xf "${lilypond_archive}"
@@ -77,7 +72,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        python -m pip install -r ci/requirements.txt
+        python -m pip install -r ci/requirements.txt --no-cache-dir
 
     - name: Log dependencies
       run: |