From b483af41262fe6ebe8a60126ef7eda09f4d841a8 Mon Sep 17 00:00:00 2001 From: rbaron Date: Wed, 30 Nov 2022 21:13:19 +0100 Subject: [PATCH] Fixes actions --- .github/actions/build_and_upload/action.yml | 1 - .github/workflows/b-parasite.yml | 22 +++++++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.github/actions/build_and_upload/action.yml b/.github/actions/build_and_upload/action.yml index a3d8ebb..a7c9b82 100644 --- a/.github/actions/build_and_upload/action.yml +++ b/.github/actions/build_and_upload/action.yml @@ -18,7 +18,6 @@ runs: using: "composite" steps: - uses: ./.github/actions/build - image: 'Dockerfile' with: sample-dir: ${{ inputs.sample-dir }} board: ${{ inputs.board }} diff --git a/.github/workflows/b-parasite.yml b/.github/workflows/b-parasite.yml index d4535c2..3474726 100644 --- a/.github/workflows/b-parasite.yml +++ b/.github/workflows/b-parasite.yml @@ -9,41 +9,47 @@ on: jobs: build: runs-on: ubuntu-latest - name: Checks format & builds samples + name: Check format & build samples steps: - name: Checkout uses: actions/checkout@v3 - - name: Run clang-format style check + - name: Check clang-format uses: jidicula/clang-format-action@v4.9.0 with: check-path: 'code/nrf-connect' - - uses: ./.github/actions/build + - name: Build blinky + uses: ./.github/actions/build with: sample-dir: code/nrf-connect/samples/blinky board: bparasite_nrf52840 output-bin: blinky_nrf52840.hex - - uses: ./.github/actions/build + - name: Build soil_read_loop + uses: ./.github/actions/build with: sample-dir: code/nrf-connect/samples/soil_read_loop board: bparasite_nrf52840 output-bin: soil_read_loop_nrf52840.hex - - uses: ./.github/actions/build_and_upload + - name: Build ble_nrf52840_default.hex + uses: ./.github/actions/build_and_upload with: sample-dir: code/nrf-connect/samples/ble board: bparasite_nrf52840 output-bin: ble_nrf52840_default.hex - - uses: ./.github/actions/build_and_upload + - name: Build ble_nrf52840_bthomev1.hex + uses: ./.github/actions/build_and_upload with: sample-dir: code/nrf-connect/samples/ble board: bparasite_nrf52840 cmake-extra: -DCONFIG_PRST_BLE_ENCODING_BTHOME_V1=y output-bin: ble_nrf52840_bthomev1.hex - - uses: ./.github/actions/build_and_upload + - name: Build ble_nrf52833_default.hex + uses: ./.github/actions/build_and_upload with: sample-dir: code/nrf-connect/samples/ble board: bparasite_nrf52833 output-bin: ble_nrf52833_default.hex - - uses: ./.github/actions/build_and_upload + - name: Build ble_nrf52833_bthomev1.hex + uses: ./.github/actions/build_and_upload with: sample-dir: code/nrf-connect/samples/ble board: bparasite_nrf52833