Merge pull request #159 from shinyblink/fix-ci

shinyblink · Jan 2, 2025 · 65b5ca2 · 65b5ca2
2 parents 60641c1 + 9596495
commit 65b5ca2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -7,10 +7,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12]
+        os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, macos-13, macos-14, macos-15]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Prepare CI config
       run: cp Makefiles/sledconf.ci ./sledconf
     - name: Build
@@ -19,16 +19,16 @@ jobs:
       run: ./sled
 
   nspire:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: sled
 
       - name: Checkout ndless
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ndless-nspire/Ndless
           path: ndless
@@ -40,7 +40,7 @@ jobs:
           echo "NDLESS_SHA=$(git rev-parse HEAD)" >> $GITHUB_ENV
       
       ## toolchain
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         id: toolchain-cache
         with:
           path: ndless/ndless-sdk/toolchain/install
@@ -58,7 +58,7 @@ jobs:
         run: echo "$GITHUB_WORKSPACE/ndless/ndless-sdk/bin" >> $GITHUB_PATH
 
       # ndless SDK
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         id: sdk-cache
         with:
           path: ndless/ndless-sdk
@@ -67,7 +67,8 @@ jobs:
         if: steps.sdk-cache.outputs.cache-hit != 'true'
         run: echo "$GITHUB_WORKSPACE/ndless/ndless-sdk/toolchain/install/bin" >> $GITHUB_PATH
       - name: Install ndless SDK dependencies
-        if: steps.sdk-cache.outputs.cache-hit != 'true'
+        # we need this at runtime as well
+        #if: steps.sdk-cache.outputs.cache-hit != 'true'
         run: sudo apt install -y libboost-program-options-dev
       - name: Build ndless SDK
         if: steps.sdk-cache.outputs.cache-hit != 'true'
@@ -87,7 +88,7 @@ jobs:
           NDLESS_SDK: ../ndless/ndless-sdk
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: sled for ndless
           path: sled/sled.tns
diff --git a/src/modules/gfx_belou_zhabo_ca.c b/src/modules/gfx_belou_zhabo_ca.c
@@ -141,4 +141,6 @@ int draw(int moduleid, int argc, char* argv[])
 
 void deinit(int moduleid)
 {
+	free(cdat);
+	free(ndat);
 }