Skip to content

Commit 46064c2

Browse files
committed
attempt to match other build ymls
1 parent 75a8c65 commit 46064c2

File tree

1 file changed

+21
-19
lines changed

1 file changed

+21
-19
lines changed

.github/workflows/build-nuttx.yml

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,30 +23,24 @@ jobs:
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 apt dependencies
3327
run: |
34-
sudo rm /usr/local/bin/swift*
35-
wget -q https://download.swift.org/development/ubuntu2404/${{ matrix.swift }}/${{ matrix.swift }}-ubuntu24.04.tar.gz
36-
tar xzf ${{ matrix.swift }}-ubuntu24.04.tar.gz
37-
export PATH="$PATH:`pwd`/${{ matrix.swift }}-ubuntu24.04/usr/bin/"
38-
echo "PATH=$PATH" >> $GITHUB_ENV
39-
swiftc --version
40-
41-
- name: Install Build tools
42-
run: |
43-
sudo apt -y update
44-
sudo apt -y install \
28+
run:
29+
sudo apt-get -qq update && sudo apt-get -qq -y install \
4530
bison flex gettext texinfo libncurses5-dev libncursesw5-dev \
4631
gperf automake libtool pkg-config build-essential gperf genromfs \
4732
libgmp-dev libmpc-dev libmpfr-dev libisl-dev binutils-dev libelf-dev \
4833
libexpat-dev gcc-multilib g++-multilib u-boot-tools util-linux \
49-
kconfig-frontends
34+
kconfig-frontends ninja-build
35+
36+
- name: Install CMake 3.30.2
37+
run: |
38+
ARCH=`uname -m`
39+
curl -sL https://github.com/Kitware/CMake/releases/download/v3.30.2/cmake-3.30.2-linux-$ARCH.tar.gz -O
40+
tar xzf cmake-3.30.2-linux-$ARCH.tar.gz
41+
export PATH="`pwd`/cmake-3.30.2-linux-$ARCH/bin:$PATH"
42+
echo "PATH=$PATH" >> $GITHUB_ENV
43+
cmake --version
5044
5145
- name: Install RISC-V toolchain
5246
run: |
@@ -57,6 +51,14 @@ jobs:
5751
echo "PATH=$PATH" >> $GITHUB_ENV
5852
riscv-none-elf-gcc --version
5953
54+
- name: Install ${{ matrix.swift }}
55+
run: |
56+
wget -q https://download.swift.org/development/ubuntu2404/${{ matrix.swift }}/${{ matrix.swift }}-ubuntu24.04.tar.gz
57+
tar xzf ${{ matrix.swift }}-ubuntu24.04.tar.gz
58+
export PATH="$PATH:`pwd`/${{ matrix.swift }}-ubuntu24.04/usr/bin/"
59+
echo "PATH=$PATH" >> $GITHUB_ENV
60+
swiftc --version
61+
6062
- name: Config ${{ matrix.example }}
6163
working-directory: ${{ matrix.example }}
6264
run: cmake -B build -GNinja -DBOARD_CONFIG=rv-virt:leds_swift -DENABLE_NUTTX_TRACE=ON

0 commit comments

Comments
 (0)