From 7ab877cbb68504b53526ab59f1cb7473d3c50340 Mon Sep 17 00:00:00 2001
From: Peter Wittich <wittich@cornell.edu>
Date: Thu, 15 Feb 2024 22:17:28 -0500
Subject: [PATCH] fix codeql workflow too

---
 .github/workflows/c-cpp.yml           |  2 --
 .github/workflows/codeql-analysis.yml | 19 +++----------------
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index d36f25b5..17144f60 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -8,7 +8,6 @@ on:
   schedule:
     - cron: '30 4 * * 1'
   workflow_dispatch:
-    branches: [ master ]
 
 #  note that I need to manually set the path for the arm-none-eabi-gcc exe
 #  after it comes out of the cache. I don't understand why I need to do that.
@@ -25,7 +24,6 @@ jobs:
       uses: carlosperate/arm-none-eabi-gcc-action@v1.8.1
       with:
         release: '13.2.Rel1' # The arm-none-eabi-gcc release to use.
-        # Directory to unpack GCC to. Defaults to a temporary directory.
     - name: make with GCC, debug build, Rev1
       run: |
         export PATH=${PATH}:$HOME/work/_temp/arm-none-eabi/bin:
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 2ac82f43..60775967 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -50,28 +50,15 @@ jobs:
         # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
-    - name: Check cache for Embedded Arm Toolchain arm-none-eabi-gcc
-      id:   cache-toolchain
-      uses: actions/cache@v2
-      env:
-        cache-name: cache-toolchain-10-2020-q4
-      with:
-        path: ${{ runner.temp }}/arm-none-eabi
-        key:  ${{ runner.os }}-buildv1-${{ env.cache-name }}
-        restore-keys: ${{ runner.os }}-buildv1-${{ env.cache-name }}
-
     - name: Install Embedded Arm Toolchain arm-none-eabi-gcc
-      if:   steps.cache-toolchain.outputs.cache-hit != 'true'  # Install toolchain if not found in cache
-      uses: fiam/arm-none-eabi-gcc@v1.0.4
+      uses: carlosperate/arm-none-eabi-gcc-action@v1.8.1
       with:
-        release: '10-2020-q4' # The arm-none-eabi-gcc release to use.
-        # Directory to unpack GCC to. Defaults to a temporary directory.
-        directory: ${{ runner.temp }}/arm-none-eabi
+        release: '13.2.Rel1' # The arm-none-eabi-gcc release to use.
     - name: make with GCC
       run: |
         export PATH=${PATH}:$HOME/work/_temp/arm-none-eabi/bin:
         arm-none-eabi-gcc --version
-        make -k -w VERBOSE=1 REV1=1
+        make -k -w VERBOSE=1 
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2