WIP

Author: bahusoid

.github/workflows/build.yml

@@ -39,10 +39,6 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
-    - name: Add /tmp/local/bin to PATH
-      run: |
-        echo "/tmp/local/bin" >> $GITHUB_PATH
-
     - name: Restore toolchain dependencies
       id: cache-before
       uses: actions/cache/restore@v3
@@ -51,19 +47,45 @@ jobs:
           /tmp/rbdev-dl
           /tmp/local
           /tmp/rbdev-build
+          /tmp/rockboxdev_path_modifications
         key: ${{ runner.os }}-toolchain-${{ matrix.arch }}-${{ hashFiles('tools/rockboxdev.sh') }}
         restore-keys: |
           ${{ runner.os }}-toolchain-${{ matrix.arch }}-
           ${{ runner.os }}-toolchain-
 
-    - name: make it all
+    - name: Restore PATH from cached modifications
+      if: steps.cache-before.outputs.cache-hit == 'true'
+      run: |
+        # Append the cached PATH modifications to GITHUB_PATH
+        while IFS= read -r line; do
+          echo "$line" >> $GITHUB_PATH
+        done < /tmp/rockboxdev_path_modifications
+        
+    - name: Install dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install automake bison build-essential ccache flex libc6-dev libgmp3-dev libmpfr-dev libsdl1.2-dev libtool-bin texinfo zip gawk wget libmpc-dev gettext
+        sudo apt-get install -y automake bison build-essential ccache flex libc6-dev libgmp3-dev libmpfr-dev \
+        libsdl1.2-dev libtool-bin texinfo zip gawk wget libmpc-dev gettext
+
+    - name: Run rockboxdev.sh and save PATH modifications
+      if: steps.cache-before.outputs.cache-hit != 'true'
+      run: |
+        echo "$PATH" > /tmp/original_path
         cd tools
         chmod +x rockboxdev.sh
         sudo ./rockboxdev.sh --target=${{matrix.arch}}
         cd ..
+
+        # Compare the modified PATH with the original PATH
+        comm -13 <(sort /tmp/original_path) <(echo "$PATH" | tr ':' '\n' | sort) > /tmp/rockboxdev_path_modifications
+
+        # Append the modifications to GITHUB_PATH
+        while IFS= read -r line; do
+          echo "$line" >> $GITHUB_PATH
+        done < /tmp/rockboxdev_path_modifications
+
+    - name: Build Rockbox
+      run: |
         mkdir build
         cd build
         ../tools/configure --target=${{matrix.platform}} --type=N
@@ -78,10 +100,10 @@ jobs:
           /tmp/rbdev-dl
           /tmp/local
           /tmp/rbdev-build
+          /tmp/rockboxdev_path_modifications
         key: ${{ runner.os }}-toolchain-${{ matrix.arch }}-${{ hashFiles('tools/rockboxdev.sh') }}
         restore-keys: |
           ${{ runner.os }}-toolchain-${{ matrix.arch }}-
-          ${{ runner.os }}-toolchain-
 
     - name: Upload build
       uses: actions/upload-artifact@v4