From 018b662363a5e2e8c40177594c7658cef5bc987f Mon Sep 17 00:00:00 2001
From: Rauhul Varma <rauhul@apple.com>
Date: Thu, 2 Jan 2025 21:29:01 -0800
Subject: [PATCH] attempt to match other build ymls

---
 .github/workflows/build-nuttx.yml | 40 ++++++++++++++++---------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/build-nuttx.yml b/.github/workflows/build-nuttx.yml
index 3b8c326..445f988 100644
--- a/.github/workflows/build-nuttx.yml
+++ b/.github/workflows/build-nuttx.yml
@@ -23,30 +23,23 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v4
 
-      - name: Set up CMake + Ninja
-        uses: lukka/get-cmake@latest
-        with:
-          cmakeVersion: latest
-          ninjaVersion: latest
-
-      - name: Install ${{ matrix.swift }} and remove old version
+      - name: Install apt dependencies
         run: |
-          sudo rm /usr/local/bin/swift*
-          wget -q https://download.swift.org/development/ubuntu2404/${{ matrix.swift }}/${{ matrix.swift }}-ubuntu24.04.tar.gz
-          tar xzf ${{ matrix.swift }}-ubuntu24.04.tar.gz
-          export PATH="$PATH:`pwd`/${{ matrix.swift }}-ubuntu24.04/usr/bin/"
-          echo "PATH=$PATH" >> $GITHUB_ENV
-          swiftc --version
-
-      - name: Install Build tools
-        run: |
-          sudo apt -y update
-          sudo apt -y install \
+          sudo apt-get -qq update && sudo apt-get -qq -y install \
             bison flex gettext texinfo libncurses5-dev libncursesw5-dev \
             gperf automake libtool pkg-config build-essential gperf genromfs \
             libgmp-dev libmpc-dev libmpfr-dev libisl-dev binutils-dev libelf-dev \
             libexpat-dev gcc-multilib g++-multilib u-boot-tools util-linux \
-            kconfig-frontends
+            kconfig-frontends ninja-build
+
+      - name: Install CMake 3.30.2
+        run: |
+          ARCH=`uname -m`
+          curl -sL https://github.com/Kitware/CMake/releases/download/v3.30.2/cmake-3.30.2-linux-$ARCH.tar.gz -O
+          tar xzf cmake-3.30.2-linux-$ARCH.tar.gz
+          export PATH="`pwd`/cmake-3.30.2-linux-$ARCH/bin:$PATH"
+          echo "PATH=$PATH" >> $GITHUB_ENV
+          cmake --version
 
       - name: Install RISC-V toolchain
         run: |
@@ -57,6 +50,15 @@ jobs:
           echo "PATH=$PATH" >> $GITHUB_ENV
           riscv-none-elf-gcc --version
 
+      - name: Install ${{ matrix.swift }} and remove old version
+        run: |
+          sudo rm /usr/local/bin/swift*
+          wget -q https://download.swift.org/development/ubuntu2404/${{ matrix.swift }}/${{ matrix.swift }}-ubuntu24.04.tar.gz
+          tar xzf ${{ matrix.swift }}-ubuntu24.04.tar.gz
+          export PATH="$PATH:`pwd`/${{ matrix.swift }}-ubuntu24.04/usr/bin/"
+          echo "PATH=$PATH" >> $GITHUB_ENV
+          swiftc --version
+
       - name: Config ${{ matrix.example }}
         working-directory: ${{ matrix.example }}
         run: cmake -B build -GNinja -DBOARD_CONFIG=rv-virt:leds_swift -DENABLE_NUTTX_TRACE=ON