From d7894df3088823424c64968c47b267743bad8eef Mon Sep 17 00:00:00 2001 From: Phil Howard Date: Thu, 4 Aug 2022 11:39:30 +0100 Subject: [PATCH] BadgerOS: Fix with-modules build. --- .github/workflows/micropython-badger2040.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/micropython-badger2040.yml b/.github/workflows/micropython-badger2040.yml index 020b986c..2144cc4a 100644 --- a/.github/workflows/micropython-badger2040.yml +++ b/.github/workflows/micropython-badger2040.yml @@ -100,19 +100,19 @@ jobs: shell: bash working-directory: micropython/ports/rp2 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) shell: bash working-directory: micropython/ports/rp2 run: | 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 - name: Rename .uf2 for artifact (No BadgerOS) shell: bash - working-directory: micropython/ports/rp2/build-${{env.BOARD_TYPE}} + working-directory: micropython/ports/rp2/build-${{env.BOARD_TYPE}}-without-badger-os run: | cp firmware.uf2 ${{env.RELEASE_FILE}}-without-badger-os.uf2 @@ -120,7 +120,7 @@ jobs: uses: actions/upload-artifact@v2 with: 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) if: github.event_name == 'release' @@ -128,7 +128,7 @@ jobs: env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} 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}} asset_name: ${{env.RELEASE_FILE}}-without-badger-os.uf2 asset_content_type: application/octet-stream