From 761c86d033e4deb3fbff26c8df5610da0b189c1a Mon Sep 17 00:00:00 2001 From: Shahabaz Bagwan <4272320+Shahabaz-Bagwan@users.noreply.github.com> Date: Wed, 16 Aug 2023 12:13:40 +0200 Subject: [PATCH 1/3] Update build_chocofi.yml --- .github/workflows/build_chocofi.yml | 58 +---------------------------- 1 file changed, 1 insertion(+), 57 deletions(-) diff --git a/.github/workflows/build_chocofi.yml b/.github/workflows/build_chocofi.yml index d3b9607..d74fb89 100644 --- a/.github/workflows/build_chocofi.yml +++ b/.github/workflows/build_chocofi.yml @@ -1,61 +1,5 @@ on: [push, pull_request, workflow_dispatch] -name: Build_chocofi - jobs: build: - runs-on: ubuntu-latest - container: - image: zmkfirmware/zmk-build-arm:stable - name: Build - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Cache west modules - uses: actions/cache@v2 - env: - cache-name: cache-zephyr-modules - with: - path: | - modules/ - tools/ - zephyr/ - bootloader/ - zmk/ - key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('manifest-dir/west.yml') }} - restore-keys: | - ${{ runner.os }}-build-${{ env.cache-name }}- - ${{ runner.os }}-build- - ${{ runner.os }}- - - name: West Init - run: west init -l config - - name: West Update - run: west update - - name: West Zephyr export - run: west zephyr-export - - name: West Build (Chocofi Left) - run: west build -s zmk/app -b nice_nano_v2 -- -DSHIELD=chocofi_left -DZMK_CONFIG="${GITHUB_WORKSPACE}/config" - - name: Chocofi DTS File - if: ${{ always() }} - run: cat -n build/zephyr/nice_nano_v2.dts.pre.tmp - - name: Chocofi Left Kconfig file - run: cat build/zephyr/.config | grep -v "^#" | grep -v "^$" - - name: Rename zmk.uf2 - run: cp build/zephyr/zmk.uf2 chocofi_left_nice_nano_v2.uf2 - - name: Archive (chocofi Left) - uses: actions/upload-artifact@v2 - with: - name: firmware - path: chocofi_left_nice_nano_v2.uf2 - - name: West Build (Chocofi Right) - run: west build --pristine -s zmk/app -b nice_nano_v2 -- -DSHIELD=chocofi_right -DZMK_CONFIG="${GITHUB_WORKSPACE}/config" - - - name: Chocofi Right Kconfig file - run: cat build/zephyr/.config | grep -v "^#" | grep -v "^$" - - name: Rename zmk.uf2 - run: cp build/zephyr/zmk.uf2 chocofi_right_nice_nano_v2.uf2 - - name: Archive (Chocofi Right) - uses: actions/upload-artifact@v2 - with: - name: firmware - path: chocofi_right_nice_nano_v2.uf2 + uses: zmkfirmware/zmk/.github/workflows/build-user-config.yml@main From 00a5c78239335d0043b86e437681b2dbc7160863 Mon Sep 17 00:00:00 2001 From: Shahabaz Bagwan <4272320+Shahabaz-Bagwan@users.noreply.github.com> Date: Wed, 16 Aug 2023 12:15:48 +0200 Subject: [PATCH 2/3] Create build.yaml --- build.yaml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 build.yaml diff --git a/build.yaml b/build.yaml new file mode 100644 index 0000000..ee8ce92 --- /dev/null +++ b/build.yaml @@ -0,0 +1,21 @@ +# This file generates the GitHub Actions matrix +# For simple board + shield combinations, add them +# to the top level board and shield arrays, for more +# control, add individual board + shield combinations to +# the `include` property, e.g: +# +# board: [ "nice_nano_v2" ] +# shield: [ "corne_left", "corne_right" ] +# include: +# - board: bdn9_rev2 +# - board: nice_nano_v2 +# shield: reviung41 +# +--- +include: + - board: nice_nano_v2 + shield: corne_left + - board: nice_nano_v2 + shield: corne_right + - board: nice_nano_v2 + shield: settings_reset From cae6374f985f18c28ca9281fe65ebbb920c74ad3 Mon Sep 17 00:00:00 2001 From: Shahabaz Bagwan <4272320+Shahabaz-Bagwan@users.noreply.github.com> Date: Wed, 16 Aug 2023 12:16:18 +0200 Subject: [PATCH 3/3] Update build.yaml --- build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.yaml b/build.yaml index ee8ce92..9334052 100644 --- a/build.yaml +++ b/build.yaml @@ -14,8 +14,8 @@ --- include: - board: nice_nano_v2 - shield: corne_left + shield: chocofi_left - board: nice_nano_v2 - shield: corne_right + shield: chocofi_right - board: nice_nano_v2 shield: settings_reset