3232 - name : Install build dependencies
3333 run : |
3434 sudo apt-get update
35- sudo apt-get install -y cmake ninja-build unzip wget
35+ sudo apt-get install -y unzip wget
3636
3737 - name : Set up Java
3838 uses : actions/setup-java@v4
@@ -120,32 +120,34 @@ jobs:
120120 - name : Generate bootloader project files
121121 working-directory : bootloader
122122 run : |
123- slc generate bootloader-${{ matrix.board }}.slcp \
124- -o cmake \
123+ slc generate bootloader.slcp \
124+ --with "${{ matrix.board }};wavephoenix" \
125+ --sdk-extensions=../boards \
126+ -o makefile \
125127 -d target/${{ matrix.board }}
126128
127129 - name : Build bootloader
128- working-directory : bootloader/target/${{ matrix.board }}/bootloader_cmake
130+ working-directory : bootloader
129131 run : |
130- cmake --workflow --preset project
132+ make -C target/${{ matrix.board }} -f bootloader.Makefile release
131133
132134 # Build firmware
133135 - name : Generate firmware project files
134136 working-directory : firmware
135137 run : |
136138 slc generate wavephoenix.slcp \
137139 --with "${{ matrix.board }};wavephoenix" \
138- --sdk-extensions=., libjoybus,libwavebird \
139- -o cmake \
140+ --sdk-extensions=../boards,../ libjoybus,../ libwavebird \
141+ -o makefile \
140142 -d target/${{ matrix.board }}
141143
142144 - name : Build firmware
143- working-directory : firmware/target/${{ matrix.board }}/wavephoenix_cmake
145+ working-directory : firmware
144146 run : |
145- cmake --workflow --preset project
147+ make -C target/${{ matrix.board }} -f wavephoenix.Makefile release
146148
147149 - name : Generate firmware .gbl
148- working-directory : firmware/target/${{ matrix.board }}/wavephoenix_cmake/ build/default_config
150+ working-directory : firmware/target/${{ matrix.board }}/build/release
149151 run : |
150152 commander gbl create \
151153 --app wavephoenix.s37 \
@@ -160,14 +162,13 @@ jobs:
160162 VERSION="trunk"
161163 fi
162164
163- mv bootloader/target/${{ matrix.board }}/bootloader_cmake/ build/default_config /bootloader.hex "wavephoenix-bootloader-${VERSION}-${{ matrix.board }}.hex"
164- mv firmware/target/${{ matrix.board }}/wavephoenix_cmake/ build/default_config /wavephoenix.hex "wavephoenix-receiver-${VERSION}-${{ matrix.board }}.hex"
165- mv firmware/target/${{ matrix.board }}/wavephoenix_cmake/ build/default_config /wavephoenix.gbl "wavephoenix-receiver-${VERSION}-${{ matrix.board }}.gbl"
165+ mv bootloader/target/${{ matrix.board }}/build/release /bootloader.hex "wavephoenix-bootloader-${VERSION}-${{ matrix.board }}.hex"
166+ mv firmware/target/${{ matrix.board }}/build/release /wavephoenix.hex "wavephoenix-receiver-${VERSION}-${{ matrix.board }}.hex"
167+ mv firmware/target/${{ matrix.board }}/build/release /wavephoenix.gbl "wavephoenix-receiver-${VERSION}-${{ matrix.board }}.gbl"
166168
167169 - name : Update trunk tag
168170 if : github.ref == 'refs/heads/main'
169171 run : |
170- cd ${{ env.REPO_PATH }}
171172 git tag -f trunk
172173 git push -f origin trunk
173174 env :
0 commit comments