From a7edee78dd318d08f496c94c3ebea5b307bf8ab9 Mon Sep 17 00:00:00 2001 From: fridtjof Date: Thu, 2 Jan 2025 00:50:14 +0100 Subject: [PATCH 1/7] CI: bump macOS versions --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 06e60047..f098a963 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,7 +7,7 @@ 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, macos-13, macos-14] steps: - uses: actions/checkout@v3 From be6fd7401a2e0e0961aab6ded7f7daffeaa5c0da Mon Sep 17 00:00:00 2001 From: fridtjof Date: Thu, 2 Jan 2025 00:50:35 +0100 Subject: [PATCH 2/7] CI: add ubuntu 24.04 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f098a963..625d8161 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,7 +7,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, ubuntu-22.04, macos-13, macos-14] + os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, macos-13, macos-14] steps: - uses: actions/checkout@v3 From b69760dbf5cdf086aad4694b335e2ad7309797ac Mon Sep 17 00:00:00 2001 From: fridtjof Date: Thu, 2 Jan 2025 00:50:46 +0100 Subject: [PATCH 3/7] CI: add macOS 15 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 625d8161..1613a91b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,7 +7,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, macos-13, macos-14] + os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, macos-13, macos-14, macos-15] steps: - uses: actions/checkout@v3 From 5a6d54ee8f1831348424876d2d55ddfb2ceea30f Mon Sep 17 00:00:00 2001 From: fridtjof Date: Thu, 2 Jan 2025 01:33:36 +0100 Subject: [PATCH 4/7] gfx_belou_zhabo_ca: fix memory leak --- src/modules/gfx_belou_zhabo_ca.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/modules/gfx_belou_zhabo_ca.c b/src/modules/gfx_belou_zhabo_ca.c index 729f3ce7..76aeea62 100644 --- 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); } From f0c04cc7edb364bf95e1db53708873be587d57b1 Mon Sep 17 00:00:00 2001 From: fridtjof Date: Thu, 2 Jan 2025 01:43:28 +0100 Subject: [PATCH 5/7] CI: bump nspire runner version --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1613a91b..49d31b97 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,7 @@ jobs: run: ./sled nspire: - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - name: Checkout From 8b2cdfcedc94dde72b697d2ab2a523dfb5dba793 Mon Sep 17 00:00:00 2001 From: fridtjof Date: Thu, 2 Jan 2025 02:48:22 +0100 Subject: [PATCH 6/7] CI: bump actions versions --- .github/workflows/main.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 49d31b97..808dba0c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,7 +10,7 @@ jobs: 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 @@ -23,12 +23,12 @@ jobs: 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 @@ -87,7 +87,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 From 959649523f852d548d14f252bc09d2d9eebef89c Mon Sep 17 00:00:00 2001 From: fridtjof Date: Thu, 2 Jan 2025 02:57:17 +0100 Subject: [PATCH 7/7] CI: fix cached ndless toolchain --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 808dba0c..e2cdb67f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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'