From f9401c4c034351bb53e1fb1dbd4c54cedb33d808 Mon Sep 17 00:00:00 2001
From: PProvost <peter@provost.org>
Date: Thu, 14 May 2020 14:11:20 -0600
Subject: [PATCH] Updated GH actions to cache arm-none-eabi

---
 .github/workflows/ci_cortex_m4.yml |  8 +-------
 .github/workflows/ci_cortex_m7.yml | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci_cortex_m4.yml b/.github/workflows/ci_cortex_m4.yml
index 8febdae5..143f5486 100644
--- a/.github/workflows/ci_cortex_m4.yml
+++ b/.github/workflows/ci_cortex_m4.yml
@@ -26,9 +26,7 @@ jobs:
         token: ${{ secrets.REPO_SCOPED_TOKEN }}
         submodules: true
 
-#     - name: Install build-essential
-#       run: sudo apt-get install build-essential
-
+    # Store the arm compilers in the cache to speed up builds
     - name: Cache arm-none-eabi-gcc tools
       id: cache-arm-gcc
       uses: actions/cache@v1
@@ -52,10 +50,6 @@ jobs:
     - name: Install ninja-build
       uses: seanmiddleditch/gha-setup-ninja@v1
 
-    - name: Update $PATH if using cache
-      if: steps.cache-arm-gcc.outputs.cache-hit == 'true'
-      run: echo "::addPath::$HOME/arm-none-eabi-gcc-9-2019-q4/bin"
-
     # Prepare the build system
     - name: Prepare build system
       run: cmake -Bbuild -DCMAKE_TOOLCHAIN_FILE=./cmake/cortex_m4.cmake -GNinja .
diff --git a/.github/workflows/ci_cortex_m7.yml b/.github/workflows/ci_cortex_m7.yml
index 82aa3865..afbb076a 100644
--- a/.github/workflows/ci_cortex_m7.yml
+++ b/.github/workflows/ci_cortex_m7.yml
@@ -26,14 +26,21 @@ jobs:
         token: ${{ secrets.REPO_SCOPED_TOKEN }}
         submodules: true
 
-#     - name: Install build-essential
-#       run: sudo apt-get install build-essential
+    # Store the arm compilers in the cache to speed up builds
+    - name: Cache arm-none-eabi-gcc tools
+      id: cache-arm-gcc
+      uses: actions/cache@v1
+      with:
+        path: $HOME/arm-none-eabi-gcc-9-2019-q4
+        key: ${{ runner.os }}-arm-gcc-9-2019-q4
 
     # Get the arm-non-eabi-gcc toolchain   
     - name: Install arm-none-eabi-gcc
       uses: fiam/arm-none-eabi-gcc@v1
+      if: steps.cache-arm-gcc.outputs.cache-hit != 'true'
       with:
           release: '9-2019-q4' # The arm-none-eabi-gcc release to use.
+          directory: $HOME/arm-none-eabi-gcc-9-2019-q4
 
     # Get CMake into the environment
     - name: Install cmake 3.17.1
@@ -46,8 +53,12 @@ jobs:
     # Prepare the build system
     - name: Prepare build system
       run: cmake -Bbuild -DCMAKE_TOOLCHAIN_FILE=./cmake/cortex_m7.cmake -GNinja .
+      env:
+        PATH: "$HOME/arm-none-eabi-gcc-9-2019-q4/bin:$PATH"
 
     - name: Compile and link
       run: cmake --build ./build
+      env:
+        PATH: "$HOME/arm-none-eabi-gcc-9-2019-q4/bin:$PATH"