diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index bd5c3de..56e880c 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -13,9 +13,6 @@ inputs: cmake-extra: description: "Extra CMake arguments" default: "" - output-bin: - description: "Name of the .hex output" - required: true runs: using: "composite" steps: @@ -28,7 +25,3 @@ runs: --board ${{ inputs.board }}@${{ inputs.revision }} \ /repo/${{ inputs.sample-dir }} -- ${{ inputs.cmake-extra }} shell: bash - - run: | - cp "${GITHUB_WORKSPACE}"/${{ inputs.sample-dir }}/build/zephyr/zephyr.hex \ - "${GITHUB_WORKSPACE}"/${{ inputs.sample-dir }}/build/zephyr/${{ inputs.output-bin }} - shell: bash diff --git a/.github/actions/build_and_upload/action.yml b/.github/actions/build_and_upload/action.yml deleted file mode 100644 index be2b199..0000000 --- a/.github/actions/build_and_upload/action.yml +++ /dev/null @@ -1,33 +0,0 @@ -name: "Build and upload artifact" -description: "Builds a nrf-connect sample for b-parasite" -inputs: - sample-dir: - description: "Sample directory to build" - required: true - board: - description: "Board definition to use" - required: true - revision: - description: "Board revision use" - default: "2.0.0" - cmake-extra: - description: "Extra CMake arguments" - default: "" - output-bin: - description: "Name of the .hex output" - required: true - -runs: - using: "composite" - steps: - - uses: ./.github/actions/build - with: - sample-dir: ${{ inputs.sample-dir }} - board: ${{ inputs.board }} - revision: ${{ inputs.revision }} - cmake-extra: ${{ inputs.cmake-extra }} - output-bin: ${{ inputs.output-bin }} - - uses: actions/upload-artifact@v3 - with: - name: sample-binaries - path: ${{ inputs.sample-dir }}/build/zephyr/${{ inputs.output-bin }} diff --git a/.github/workflows/b-parasite.yml b/.github/workflows/b-parasite.yml index 8d20e2d..97fe1cd 100644 --- a/.github/workflows/b-parasite.yml +++ b/.github/workflows/b-parasite.yml @@ -81,7 +81,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Build - uses: ./.github/actions/build_and_upload + uses: ./.github/actions/build with: sample-dir: code/nrf-connect/samples/ble board: bparasite_${{ matrix.soc }} @@ -102,7 +102,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Build - uses: ./.github/actions/build_and_upload + uses: ./.github/actions/build with: sample-dir: code/nrf-connect/samples/zigbee board: bparasite_${{ matrix.soc }}