Skip to content

Commit 28f7fab

Browse files
committed
attempt to match other build ymls
1 parent 75a8c65 commit 28f7fab

File tree

1 file changed

+15
-14
lines changed

1 file changed

+15
-14
lines changed

.github/workflows/build-nuttx.yml

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,36 +17,37 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
example: [nuttx-riscv-blink]
20-
swift: [swift-DEVELOPMENT-SNAPSHOT-2024-12-10-a]
20+
swift: [swift-DEVELOPMENT-SNAPSHOT-2024-12-22-a]
2121

2222
steps:
2323
- name: Checkout repo
2424
uses: actions/checkout@v4
2525

26-
- name: Set up CMake + Ninja
27-
uses: lukka/get-cmake@latest
28-
with:
29-
cmakeVersion: latest
30-
ninjaVersion: latest
31-
32-
- name: Install ${{ matrix.swift }} and remove old version
26+
- name: Install ${{ matrix.swift }}
3327
run: |
34-
sudo rm /usr/local/bin/swift*
3528
wget -q https://download.swift.org/development/ubuntu2404/${{ matrix.swift }}/${{ matrix.swift }}-ubuntu24.04.tar.gz
3629
tar xzf ${{ matrix.swift }}-ubuntu24.04.tar.gz
37-
export PATH="$PATH:`pwd`/${{ matrix.swift }}-ubuntu24.04/usr/bin/"
30+
export PATH="`pwd`/${{ matrix.swift }}-ubuntu24.04/usr/bin/:$PATH"
3831
echo "PATH=$PATH" >> $GITHUB_ENV
3932
swiftc --version
4033
41-
- name: Install Build tools
34+
- name: Install apt dependencies
4235
run: |
43-
sudo apt -y update
44-
sudo apt -y install \
36+
sudo apt-get -qq update && sudo apt-get -qq -y install \
4537
bison flex gettext texinfo libncurses5-dev libncursesw5-dev \
4638
gperf automake libtool pkg-config build-essential gperf genromfs \
4739
libgmp-dev libmpc-dev libmpfr-dev libisl-dev binutils-dev libelf-dev \
4840
libexpat-dev gcc-multilib g++-multilib u-boot-tools util-linux \
49-
kconfig-frontends
41+
kconfig-frontends ninja-build
42+
43+
- name: Install CMake 3.30.2
44+
run: |
45+
ARCH=`uname -m`
46+
curl -sL https://github.com/Kitware/CMake/releases/download/v3.30.2/cmake-3.30.2-linux-$ARCH.tar.gz -O
47+
tar xzf cmake-3.30.2-linux-$ARCH.tar.gz
48+
export PATH="`pwd`/cmake-3.30.2-linux-$ARCH/bin:$PATH"
49+
echo "PATH=$PATH" >> $GITHUB_ENV
50+
cmake --version
5051
5152
- name: Install RISC-V toolchain
5253
run: |

0 commit comments

Comments
 (0)