From 5752f277e2ae9d1af56c9118415003d0cb3b3703 Mon Sep 17 00:00:00 2001 From: gab-k Date: Thu, 2 Jan 2025 17:14:53 +0100 Subject: [PATCH] Update workflows --- .github/workflows/build_sw.yml | 8 ++--- .github/workflows/prerelease.yml | 54 ++++++++++++++++++++----------- .github/workflows/release.yml | 55 +++++++++++++++++++++----------- 3 files changed, 75 insertions(+), 42 deletions(-) diff --git a/.github/workflows/build_sw.yml b/.github/workflows/build_sw.yml index 2ff8a94..eff265f 100644 --- a/.github/workflows/build_sw.yml +++ b/.github/workflows/build_sw.yml @@ -34,20 +34,20 @@ jobs: - name: Init submodules to get tinyUSB stack run: ls && cd pico-sdk && git submodule update --init && cd .. - - name: Configure and run CMake Rev0.3 + - name: Configure and run CMake for Hardware Rev 0.3 # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type run: cmake -B ${{github.workspace}}/Software/build-Rev-0_3 -S ${{github.workspace}}/Software -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DPICO_BOARD=RP2040-Decoder-board-Rev-0_3 - - name: Build Rev0.3 + - name: Build for Hardware Rev 0.3 # Build your program with the given configuration run: cmake --build ${{github.workspace}}/Software/build-Rev-0_3 --config ${{env.BUILD_TYPE}} - - name: Configure and run CMake Rev1.0 + - name: Configure and run CMake for Hardware Rev 1.0 # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type run: cmake -B ${{github.workspace}}/Software/build-Rev-1_0 -S ${{github.workspace}}/Software -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DPICO_BOARD=RP2040-Decoder-board-Rev-1_0 - - name: Build Rev1.0 + - name: Build for Hardware Rev 1.0 # Build your program with the given configuration run: cmake --build ${{github.workspace}}/Software/build-Rev-1_0 --config ${{env.BUILD_TYPE}} \ No newline at end of file diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index 8a31a92..7f64428 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -23,35 +23,55 @@ jobs: - name: install build packages run: sudo apt-get update && sudo apt-get install cmake gcc-arm-none-eabi libnewlib-arm-none-eabi g++ libstdc++-arm-none-eabi-newlib build-essential - - name: Get sdk and add PICO_SDK_PATH - run: cd /tmp && git clone https://github.com/raspberrypi/pico-sdk.git && echo "PICO_SDK_PATH=/tmp/pico-sdk" >> $GITHUB_ENV + - name: Get SDK and add PICO_SDK_PATH + run: git clone https://github.com/raspberrypi/pico-sdk.git && echo "PICO_SDK_PATH=$GITHUB_WORKSPACE/pico-sdk" >> $GITHUB_ENV - name: Init submodules to get tinyUSB stack - run: git submodule update --init - - - name: Configure CMake + run: ls && cd pico-sdk && git submodule update --init && cd .. + + - name: Configure and run CMake for Hardware Rev 0.3 # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type - run: cmake -B ${{github.workspace}}/Software/build -S ${{github.workspace}}/Software -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} + run: cmake -B ${{github.workspace}}/Software/build-Rev-0_3 -S ${{github.workspace}}/Software -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DPICO_BOARD=RP2040-Decoder-board-Rev-0_3 - - name: Build + - name: Build for Hardware Rev 0.3 # Build your program with the given configuration - run: cmake --build ${{github.workspace}}/Software/build --config ${{env.BUILD_TYPE}} + run: cmake --build ${{github.workspace}}/Software/build-Rev-0_3 --config ${{env.BUILD_TYPE}} - - name: Upload build files as artifact + - name: Configure and run CMake for Hardware Rev 1.0 + # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. + # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type + run: cmake -B ${{github.workspace}}/Software/build-Rev-1_0 -S ${{github.workspace}}/Software -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DPICO_BOARD=RP2040-Decoder-board-Rev-1_0 + + - name: Build for Hardware Rev 1.0 + # Build your program with the given configuration + run: cmake --build ${{github.workspace}}/Software/build-Rev-1_0 --config ${{env.BUILD_TYPE}} + + - name: Upload build files as artifact Rev 0.3 uses: actions/upload-artifact@v4 with: - name: build_files - path: ${{github.workspace}}/Software/build + name: build_files_Rev-0_3 + path: ${{github.workspace}}/Software/build-Rev-0_3 + + - name: Upload build files as artifact Rev 1.0 + uses: actions/upload-artifact@v4 + with: + name: build_files_Rev-1_0 + path: ${{github.workspace}}/Software/build-Rev-1_0 prerelease: runs-on: ubuntu-latest needs: build steps: - - name: Download build files artifact + - name: Download build files artifact for Rev 0.3 uses: actions/download-artifact@v4 with: - name: build_files + name: build_files_Rev-0_3 + + - name: Download build files artifact for Rev 1.0 + uses: actions/download-artifact@v4 + with: + name: build_files_Rev-1_0 - name: Release uses: softprops/action-gh-release@v2 @@ -59,9 +79,5 @@ jobs: with: prerelease: true files: | - RP2040-Decoder.bin - RP2040-Decoder.dis - RP2040-Decoder.elf - RP2040-Decoder.elf.map - RP2040-Decoder.hex - RP2040-Decoder.uf2 \ No newline at end of file + build_files_Rev-0_3 + build_files_Rev-1_0 \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0fdfd0d..ba6a2d8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,44 +24,61 @@ jobs: - name: install build packages run: sudo apt-get update && sudo apt-get install cmake gcc-arm-none-eabi libnewlib-arm-none-eabi g++ libstdc++-arm-none-eabi-newlib build-essential - - name: Get sdk and add PICO_SDK_PATH - run: cd /tmp && git clone https://github.com/raspberrypi/pico-sdk.git && echo "PICO_SDK_PATH=/tmp/pico-sdk" >> $GITHUB_ENV - + - name: Get SDK and add PICO_SDK_PATH + run: git clone https://github.com/raspberrypi/pico-sdk.git && echo "PICO_SDK_PATH=$GITHUB_WORKSPACE/pico-sdk" >> $GITHUB_ENV + - name: Init submodules to get tinyUSB stack - run: git submodule update --init + run: ls && cd pico-sdk && git submodule update --init && cd .. - - name: Configure CMake + - name: Configure and run CMake for Hardware Rev 0.3 # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type - run: cmake -B ${{github.workspace}}/Software/build -S ${{github.workspace}}/Software -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} + run: cmake -B ${{github.workspace}}/Software/build-Rev-0_3 -S ${{github.workspace}}/Software -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DPICO_BOARD=RP2040-Decoder-board-Rev-0_3 - - name: Build + - name: Build for Hardware Rev 0.3 # Build your program with the given configuration - run: cmake --build ${{github.workspace}}/Software/build --config ${{env.BUILD_TYPE}} + run: cmake --build ${{github.workspace}}/Software/build-Rev-0_3 --config ${{env.BUILD_TYPE}} - - name: Upload build files as artifact + - name: Configure and run CMake for Hardware Rev 1.0 + # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. + # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type + run: cmake -B ${{github.workspace}}/Software/build-Rev-1_0 -S ${{github.workspace}}/Software -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DPICO_BOARD=RP2040-Decoder-board-Rev-1_0 + + - name: Build for Hardware Rev 1.0 + # Build your program with the given configuration + run: cmake --build ${{github.workspace}}/Software/build-Rev-1_0 --config ${{env.BUILD_TYPE}} + + - name: Upload build files as artifact Rev 0.3 uses: actions/upload-artifact@v4 with: - name: build_files - path: ${{github.workspace}}/Software/build + name: build_files_Rev-0_3 + path: ${{github.workspace}}/Software/build-Rev-0_3 + + - name: Upload build files as artifact Rev 1.0 + uses: actions/upload-artifact@v4 + with: + name: build_files_Rev-1_0 + path: ${{github.workspace}}/Software/build-Rev-1_0 release: runs-on: ubuntu-latest needs: build steps: - - name: Download build files artifact + - name: Download build files artifact for Rev 0.3 uses: actions/download-artifact@v4 with: - name: build_files + name: build_files_Rev-0_3 + + - name: Download build files artifact for Rev 1.0 + uses: actions/download-artifact@v4 + with: + name: build_files_Rev-1_0 - name: Release uses: softprops/action-gh-release@v2 if: startsWith(github.ref, 'refs/tags/') with: + prerelease: false files: | - RP2040-Decoder.bin - RP2040-Decoder.dis - RP2040-Decoder.elf - RP2040-Decoder.elf.map - RP2040-Decoder.hex - RP2040-Decoder.uf2 + build_files_Rev-0_3 + build_files_Rev-1_0