BadgerOS: Fix with-modules build.
This commit is contained in:
parent
2855159921
commit
d7894df308
|
@ -100,19 +100,19 @@ jobs:
|
||||||
shell: bash
|
shell: bash
|
||||||
working-directory: micropython/ports/rp2
|
working-directory: micropython/ports/rp2
|
||||||
run: |
|
run: |
|
||||||
cmake -S . -B build-${{env.BOARD_TYPE}} -DBADGER2040_NO_MODULES=1 -DPICO_BUILD_DOCS=0 -DUSER_C_MODULES=../../../pimoroni-pico-${GITHUB_SHA}/micropython/modules/badger2040-micropython.cmake -DMICROPY_BOARD=${{env.BOARD_TYPE}} -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
|
cmake -S . -B build-${{env.BOARD_TYPE}}-without-badger-os -DBADGER2040_NO_MODULES=1 -DPICO_BUILD_DOCS=0 -DUSER_C_MODULES=../../../pimoroni-pico-${GITHUB_SHA}/micropython/modules/badger2040-micropython.cmake -DMICROPY_BOARD=${{env.BOARD_TYPE}} -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
|
||||||
|
|
||||||
- name: Build MicroPython (No BadgerOS)
|
- name: Build MicroPython (No BadgerOS)
|
||||||
shell: bash
|
shell: bash
|
||||||
working-directory: micropython/ports/rp2
|
working-directory: micropython/ports/rp2
|
||||||
run: |
|
run: |
|
||||||
ccache --zero-stats || true
|
ccache --zero-stats || true
|
||||||
cmake --build build-${{env.BOARD_TYPE}} -j 2
|
cmake --build build-${{env.BOARD_TYPE}}-without-badger-os -j 2
|
||||||
ccache --show-stats || true
|
ccache --show-stats || true
|
||||||
|
|
||||||
- name: Rename .uf2 for artifact (No BadgerOS)
|
- name: Rename .uf2 for artifact (No BadgerOS)
|
||||||
shell: bash
|
shell: bash
|
||||||
working-directory: micropython/ports/rp2/build-${{env.BOARD_TYPE}}
|
working-directory: micropython/ports/rp2/build-${{env.BOARD_TYPE}}-without-badger-os
|
||||||
run: |
|
run: |
|
||||||
cp firmware.uf2 ${{env.RELEASE_FILE}}-without-badger-os.uf2
|
cp firmware.uf2 ${{env.RELEASE_FILE}}-without-badger-os.uf2
|
||||||
|
|
||||||
|
@ -120,7 +120,7 @@ jobs:
|
||||||
uses: actions/upload-artifact@v2
|
uses: actions/upload-artifact@v2
|
||||||
with:
|
with:
|
||||||
name: ${{env.RELEASE_FILE}}-without-badger-os.uf2
|
name: ${{env.RELEASE_FILE}}-without-badger-os.uf2
|
||||||
path: micropython/ports/rp2/build-${{env.BOARD_TYPE}}/${{env.RELEASE_FILE}}-without-badger-os.uf2
|
path: micropython/ports/rp2/build-${{env.BOARD_TYPE}}-without-badger-os/${{env.RELEASE_FILE}}-without-badger-os.uf2
|
||||||
|
|
||||||
- name: Upload .uf2 (No BadgerOS)
|
- name: Upload .uf2 (No BadgerOS)
|
||||||
if: github.event_name == 'release'
|
if: github.event_name == 'release'
|
||||||
|
@ -128,7 +128,7 @@ jobs:
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
|
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
|
||||||
with:
|
with:
|
||||||
asset_path: micropython/ports/rp2/build-${{env.BOARD_TYPE}}/${{env.RELEASE_FILE}}-without-badger-os.uf2
|
asset_path: micropython/ports/rp2/build-${{env.BOARD_TYPE}}-without-badger-os/${{env.RELEASE_FILE}}-without-badger-os.uf2
|
||||||
upload_url: ${{github.event.release.upload_url}}
|
upload_url: ${{github.event.release.upload_url}}
|
||||||
asset_name: ${{env.RELEASE_FILE}}-without-badger-os.uf2
|
asset_name: ${{env.RELEASE_FILE}}-without-badger-os.uf2
|
||||||
asset_content_type: application/octet-stream
|
asset_content_type: application/octet-stream
|
||||||
|
|
Loading…
Reference in New Issue