From 9dd69731123c41a251e68b4ab89ffd4b28ab3dd7 Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Mon, 20 Mar 2023 14:54:26 +0100 Subject: [PATCH 01/66] Add line --- multicore/src/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/multicore/src/main.c b/multicore/src/main.c index 96eff56..df8eaeb 100644 --- a/multicore/src/main.c +++ b/multicore/src/main.c @@ -10,6 +10,7 @@ int main(void) { printk("Hello world from %s\n", CONFIG_BOARD); + printk("Hello world from %s\n", CONFIG_BOARD); return 0; } From 3ceea4a97c31bb461ef910f8bcfda8d5129e1164 Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Mon, 20 Mar 2023 14:55:47 +0100 Subject: [PATCH 02/66] add lin 2 --- multicore/src/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/multicore/src/main.c b/multicore/src/main.c index df8eaeb..3a2d3fb 100644 --- a/multicore/src/main.c +++ b/multicore/src/main.c @@ -11,6 +11,7 @@ int main(void) { printk("Hello world from %s\n", CONFIG_BOARD); printk("Hello world from %s\n", CONFIG_BOARD); + printk("Hello world from %s\n", CONFIG_BOARD); return 0; } From 1fba42f806ea58eebe33dd14a58d1e26a00ae705 Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Mon, 20 Mar 2023 14:56:35 +0100 Subject: [PATCH 03/66] edit work --- .github/{ => workflows}/build.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/{ => workflows}/build.yml (100%) diff --git a/.github/build.yml b/.github/workflows/build.yml similarity index 100% rename from .github/build.yml rename to .github/workflows/build.yml From 7d5b63e5ebfea18206f7bbbad6dae220a9c83c9e Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Mon, 20 Mar 2023 14:58:40 +0100 Subject: [PATCH 04/66] zadas --- .github/workflows/build.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c862a23..22a7990 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,12 +2,10 @@ name: Build Firmware on: pull_request: branches: [ master ] - release: - types: [published] jobs: build: - if: "github.event_name != 'pull_request' || contains(toJSON(github.event.pull_request.body), '[enable firmware ci]') || contains(toJSON(github.event.pull_request.labels.*.name), '[enable firmware ci]')" + # if: "github.event_name != 'pull_request' || contains(toJSON(github.event.pull_request.body), '[enable firmware ci]') || contains(toJSON(github.event.pull_request.labels.*.name), '[enable firmware ci]')" runs-on: ubuntu-latest container: zephyrprojectrtos/ci:v0.25.1 env: From 4d89c7506e64eafff55bdca082b1efdc927f63b3 Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Mon, 20 Mar 2023 14:59:22 +0100 Subject: [PATCH 05/66] fix --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 22a7990..9687fb4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,8 +25,8 @@ jobs: pip3 install -r ../zephyr/scripts/requirements-base.txt - name: Build multicore - working-directory: mycode - run: | - west build --build-dir multicore\build multicore {{ matrix.sample }} --pristine \ - --board nrf5340dk_nrf5340_cpuapp -- -DNCS_TOOLCHAIN_VERSION:STRING="NONE" \ - -DCONF_FILE:STRING="multicore/prj.conf" + working-directory: mycode + run: | + west build --build-dir multicore\build multicore {{ matrix.sample }} --pristine \ + --board nrf5340dk_nrf5340_cpuapp -- -DNCS_TOOLCHAIN_VERSION:STRING="NONE" \ + -DCONF_FILE:STRING="multicore/prj.conf" From 79b0fb4ee06c775b9bab11e0f334a5cf6eed09d9 Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Mon, 20 Mar 2023 15:04:14 +0100 Subject: [PATCH 06/66] fixed --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9687fb4..e319f1a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: - name: Install west run: | - pip3 install -U wes + pip3 install -U west west init -l . west update pip3 install -r ../zephyr/scripts/requirements-base.txt From 93f686d46dca472e145af632438e3f007b3df780 Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Mon, 20 Mar 2023 15:12:38 +0100 Subject: [PATCH 07/66] commento --- .github/workflows/build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e319f1a..6d0d6e7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,12 +17,12 @@ jobs: fetch-depth: 0 path: mycode - - name: Install west - run: | - pip3 install -U west - west init -l . - west update - pip3 install -r ../zephyr/scripts/requirements-base.txt + # - name: Install west + # run: | + # pip3 install -U west + # west init -l . + # west update + # pip3 install -r ../zephyr/scripts/requirements-base.txt - name: Build multicore working-directory: mycode From 9c49eb44322d71f86c93095224ca298887442971 Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Mon, 20 Mar 2023 15:15:34 +0100 Subject: [PATCH 08/66] fix west buil --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6d0d6e7..9c0805d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,6 +27,6 @@ jobs: - name: Build multicore working-directory: mycode run: | - west build --build-dir multicore\build multicore {{ matrix.sample }} --pristine \ + west build --build-dir multicore\build multicore --pristine \ --board nrf5340dk_nrf5340_cpuapp -- -DNCS_TOOLCHAIN_VERSION:STRING="NONE" \ -DCONF_FILE:STRING="multicore/prj.conf" From 96478b1b9d6ffb7cfba59cc952348ea00b6e40f0 Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Mon, 20 Mar 2023 15:26:39 +0100 Subject: [PATCH 09/66] prova 2 --- .github/workflows/build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9c0805d..0870b55 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,12 +17,12 @@ jobs: fetch-depth: 0 path: mycode - # - name: Install west - # run: | - # pip3 install -U west - # west init -l . - # west update - # pip3 install -r ../zephyr/scripts/requirements-base.txt + - name: Install west + run: | + cd mycode + west init -l . + west update + # pip3 install -r ../zephyr/scripts/requirements-base.txt - name: Build multicore working-directory: mycode From ddba7ec38753bf1bf2b08080177dd8c6264104e6 Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Wed, 22 Mar 2023 15:52:00 +0100 Subject: [PATCH 10/66] First wflow --- .github/workflows/build.yml | 54 ++++++++++++++++++++++++++++++++++--- 1 file changed, 50 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0870b55..2dd3e41 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,11 +3,14 @@ on: pull_request: branches: [ master ] +env: + NCS_VERSION: v2.2.0 + ZEPHYR_SDK_VERSION: 0.15.2 + jobs: build: # if: "github.event_name != 'pull_request' || contains(toJSON(github.event.pull_request.body), '[enable firmware ci]') || contains(toJSON(github.event.pull_request.labels.*.name), '[enable firmware ci]')" runs-on: ubuntu-latest - container: zephyrprojectrtos/ci:v0.25.1 env: CMAKE_PREFIX_PATH: /opt/toolchains @@ -17,16 +20,59 @@ jobs: fetch-depth: 0 path: mycode + - name: Installing required tools + run: | + # See https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/getting_started/installing.html#install-the-required-tools + wget https://apt.kitware.com/kitware-archive.sh + sudo bash kitware-archive.sh + # Install dependencies + sudo apt install --no-install-recommends git cmake ninja-build gperf \ + ccache dfu-util device-tree-compiler wget \ + python3-dev python3-pip python3-setuptools python3-tk python3-wheel xz-utils file \ + make gcc gcc-multilib g++-multilib libsdl2-dev libmagic1 + + - name: Install west run: | - cd mycode - west init -l . + # See https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/getting_started/installing.html#install-west + pip3 install --user west + echo 'export PATH=~/.local/bin:"$PATH"' >> ~/.bashrc + source ~/.bashrc + + - name: Get nRF Connect SDK code + run: | + # See https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/getting_started/installing.html#get-the-ncs-code + mkdir ncs + cd ncs + west init -m https://github.com/nrfconnect/sdk-nrf --mr ${NCS_VERSION} + # TODO: edit ncs/nrf/west.yml west update - # pip3 install -r ../zephyr/scripts/requirements-base.txt + west zephyr-export + + - name: Install additional Python dependencies + run: | + # See https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/getting_started/installing.html#install-additional-python-dependencies + pip3 install --user -r zephyr/scripts/requirements.txt + pip3 install --user -r nrf/scripts/requirements.txt + pip3 install --user -r bootloader/mcuboot/scripts/requirements.txt + + - name: Install a toolchain + run: | + # See https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/getting_started/installing.html#install-a-toolchain + cd ~ + wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v${ZEPHYR_SDK_VERSION}/zephyr-sdk-${ZEPHYR_SDK_VERSION}_linux-x86_64.tar.gz + wget -O - https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v${ZEPHYR_SDK_VERSION}/sha256.sum | shasum --check --ignore-missing + tar xvf zephyr-sdk-${ZEPHYR_SDK_VERSION}_linux-x86_64.tar.gz $HOME/.local + cd $HOME/.local/zephyr-sdk-${ZEPHYR_SDK_VERSION} + ./setup.sh + sudo cp ~/zephyr-sdk-${ZEPHYR_SDK_VERSION}/sysroots/x86_64-pokysdk-linux/usr/share/openocd/contrib/60-openocd.rules /etc/udev/rules.d + sudo udevadm control --reload - name: Build multicore working-directory: mycode run: | + # Setup command line build env + source zephyr/zephyr-env.sh west build --build-dir multicore\build multicore --pristine \ --board nrf5340dk_nrf5340_cpuapp -- -DNCS_TOOLCHAIN_VERSION:STRING="NONE" \ -DCONF_FILE:STRING="multicore/prj.conf" From 9a6a7dd3dc0c2826ad78d420c8fd039b11fada6f Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Wed, 22 Mar 2023 16:00:16 +0100 Subject: [PATCH 11/66] Wflow 2 --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2dd3e41..0f89b8b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -52,6 +52,7 @@ jobs: - name: Install additional Python dependencies run: | # See https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/getting_started/installing.html#install-additional-python-dependencies + cd ncs pip3 install --user -r zephyr/scripts/requirements.txt pip3 install --user -r nrf/scripts/requirements.txt pip3 install --user -r bootloader/mcuboot/scripts/requirements.txt @@ -72,6 +73,7 @@ jobs: working-directory: mycode run: | # Setup command line build env + cd ncs source zephyr/zephyr-env.sh west build --build-dir multicore\build multicore --pristine \ --board nrf5340dk_nrf5340_cpuapp -- -DNCS_TOOLCHAIN_VERSION:STRING="NONE" \ From 4beb6c353b1054cf3431c03960340dc1a3f1fb8a Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Wed, 22 Mar 2023 16:12:20 +0100 Subject: [PATCH 12/66] wflow 3 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0f89b8b..15589ba 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -63,7 +63,7 @@ jobs: cd ~ wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v${ZEPHYR_SDK_VERSION}/zephyr-sdk-${ZEPHYR_SDK_VERSION}_linux-x86_64.tar.gz wget -O - https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v${ZEPHYR_SDK_VERSION}/sha256.sum | shasum --check --ignore-missing - tar xvf zephyr-sdk-${ZEPHYR_SDK_VERSION}_linux-x86_64.tar.gz $HOME/.local + tar xvf zephyr-sdk-${ZEPHYR_SDK_VERSION}_linux-x86_64.tar.gz --directory $HOME/.local cd $HOME/.local/zephyr-sdk-${ZEPHYR_SDK_VERSION} ./setup.sh sudo cp ~/zephyr-sdk-${ZEPHYR_SDK_VERSION}/sysroots/x86_64-pokysdk-linux/usr/share/openocd/contrib/60-openocd.rules /etc/udev/rules.d From e13ddf36be285a7460f04ce1e90bf2a4ecf47c91 Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Mon, 27 Mar 2023 14:58:56 +0200 Subject: [PATCH 13/66] letsgo --- .github/workflows/build.yml | 38 +++++++++++++++++++++++++------------ west.yaml | 21 ++++++++++++++++++++ 2 files changed, 47 insertions(+), 12 deletions(-) create mode 100644 west.yaml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 15589ba..32d12f4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,10 +3,6 @@ on: pull_request: branches: [ master ] -env: - NCS_VERSION: v2.2.0 - ZEPHYR_SDK_VERSION: 0.15.2 - jobs: build: # if: "github.event_name != 'pull_request' || contains(toJSON(github.event.pull_request.body), '[enable firmware ci]') || contains(toJSON(github.event.pull_request.labels.*.name), '[enable firmware ci]')" @@ -18,7 +14,7 @@ jobs: - uses: actions/checkout@v3 with: fetch-depth: 0 - path: mycode + path: myroot/mycode - name: Installing required tools run: | @@ -38,21 +34,40 @@ jobs: pip3 install --user west echo 'export PATH=~/.local/bin:"$PATH"' >> ~/.bashrc source ~/.bashrc + + - name: Restore cached west workspace + #TODO use flag? if: ${{ env.action-restore-cache == 'true' }} + uses: actions/cache/restore@v3 + with: + path: myroot + key: ncs-zephyr-ci-workspace-${{hashFiles(west.yml)}} # west.yml path relative to your github repo + id: cache-restore-ncs-zephyr-workspace - name: Get nRF Connect SDK code + if: ${{ steps.cache-restore-ncs-zephyr-workspace.outputs.cache-hit != 'true' }} run: | # See https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/getting_started/installing.html#get-the-ncs-code - mkdir ncs - cd ncs - west init -m https://github.com/nrfconnect/sdk-nrf --mr ${NCS_VERSION} - # TODO: edit ncs/nrf/west.yml + cd myroot + echo "west init" + west init -l --mf mycode/west.yml mycode + echo "west update" west update west zephyr-export + - name: Save cached west workspace + if: ${{ steps.cache-restore-ncs-zephyr-workspace.outputs.cache-hit != 'true' }} + uses: actions/cache/save@v3 + with: + path: + - myroot + - !myroot/mycode + key: ncs-zephyr-ci-workspace-${{hashFiles(west.yml)}} # west.yml path relative to your github repo + id: cache-save-ncs-zephyr-workspace + - name: Install additional Python dependencies + working-directory: myroot run: | # See https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/getting_started/installing.html#install-additional-python-dependencies - cd ncs pip3 install --user -r zephyr/scripts/requirements.txt pip3 install --user -r nrf/scripts/requirements.txt pip3 install --user -r bootloader/mcuboot/scripts/requirements.txt @@ -70,10 +85,9 @@ jobs: sudo udevadm control --reload - name: Build multicore - working-directory: mycode + working-directory: myroot run: | # Setup command line build env - cd ncs source zephyr/zephyr-env.sh west build --build-dir multicore\build multicore --pristine \ --board nrf5340dk_nrf5340_cpuapp -- -DNCS_TOOLCHAIN_VERSION:STRING="NONE" \ diff --git a/west.yaml b/west.yaml new file mode 100644 index 0000000..6e6cd3e --- /dev/null +++ b/west.yaml @@ -0,0 +1,21 @@ +manifest: + remotes: + - name: ncs-sdk + url-base: https://github.com/nrfconnect/sdk-nrf + - name: zephyrproject + url-base: https://github.com/zephyrproject-rtos + + defaults: + remote: ncs-sdk + + projects: + - name: ncs + repo-path: ncs-sdk + revision: v2.2.0 + import: true + - name: hal_atmel + remote: zephyrproject + path: modules/hal/atmel + revision: master + groups: + - hal \ No newline at end of file From 99696ee3fcc44007ec45970814a87ab20008203c Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Mon, 27 Mar 2023 15:44:49 +0200 Subject: [PATCH 14/66] namoo2 --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 32d12f4..f2cf9b3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,7 +40,7 @@ jobs: uses: actions/cache/restore@v3 with: path: myroot - key: ncs-zephyr-ci-workspace-${{hashFiles(west.yml)}} # west.yml path relative to your github repo + key: ncs-zephyr-ci-workspace-${{hashFiles('west.yml')}} # west.yml path relative to your github repo id: cache-restore-ncs-zephyr-workspace - name: Get nRF Connect SDK code @@ -61,7 +61,7 @@ jobs: path: - myroot - !myroot/mycode - key: ncs-zephyr-ci-workspace-${{hashFiles(west.yml)}} # west.yml path relative to your github repo + key: ncs-zephyr-ci-workspace-${{hashFiles('west.yml')}} # west.yml path relative to your github repo id: cache-save-ncs-zephyr-workspace - name: Install additional Python dependencies From cb0ac6ee6f484baf3f0ed0cf265c478beda9b793 Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Mon, 27 Mar 2023 15:51:37 +0200 Subject: [PATCH 15/66] dajeroma --- .github/workflows/build.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f2cf9b3..4ee029c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,7 +36,6 @@ jobs: source ~/.bashrc - name: Restore cached west workspace - #TODO use flag? if: ${{ env.action-restore-cache == 'true' }} uses: actions/cache/restore@v3 with: path: myroot @@ -58,8 +57,8 @@ jobs: if: ${{ steps.cache-restore-ncs-zephyr-workspace.outputs.cache-hit != 'true' }} uses: actions/cache/save@v3 with: - path: - - myroot + path: | + - myroot/* - !myroot/mycode key: ncs-zephyr-ci-workspace-${{hashFiles('west.yml')}} # west.yml path relative to your github repo id: cache-save-ncs-zephyr-workspace From f0f1a1296856b40d9f396fca25e2005db46ea448 Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Mon, 27 Mar 2023 15:56:29 +0200 Subject: [PATCH 16/66] provaprova --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4ee029c..bfa36c4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -48,7 +48,7 @@ jobs: # See https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/getting_started/installing.html#get-the-ncs-code cd myroot echo "west init" - west init -l --mf mycode/west.yml mycode + west init -l mycode echo "west update" west update west zephyr-export From da676af8ce8ea93bccfb955f33753f9c8f8781ff Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Mon, 27 Mar 2023 16:02:19 +0200 Subject: [PATCH 17/66] albero --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bfa36c4..dc3b4da 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -48,6 +48,7 @@ jobs: # See https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/getting_started/installing.html#get-the-ncs-code cd myroot echo "west init" + tree west init -l mycode echo "west update" west update From 5a907befca2b77662117bcdf618db53229e0fcae Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Mon, 27 Mar 2023 16:05:45 +0200 Subject: [PATCH 18/66] ops --- west.yaml => west.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename west.yaml => west.yml (100%) diff --git a/west.yaml b/west.yml similarity index 100% rename from west.yaml rename to west.yml From cb671110c3879ede3412ac315ce165fc9918a213 Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Mon, 27 Mar 2023 16:09:13 +0200 Subject: [PATCH 19/66] gogogo --- .github/workflows/build.yml | 1 - west.yml | 3 --- 2 files changed, 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dc3b4da..bfa36c4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -48,7 +48,6 @@ jobs: # See https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/getting_started/installing.html#get-the-ncs-code cd myroot echo "west init" - tree west init -l mycode echo "west update" west update diff --git a/west.yml b/west.yml index 6e6cd3e..2707228 100644 --- a/west.yml +++ b/west.yml @@ -5,9 +5,6 @@ manifest: - name: zephyrproject url-base: https://github.com/zephyrproject-rtos - defaults: - remote: ncs-sdk - projects: - name: ncs repo-path: ncs-sdk From 3fbb03d8427d437cf3cb697f1d677c211c06941a Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Mon, 27 Mar 2023 16:11:49 +0200 Subject: [PATCH 20/66] natra --- west.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/west.yml b/west.yml index 2707228..4b789b8 100644 --- a/west.yml +++ b/west.yml @@ -1,10 +1,13 @@ manifest: remotes: - name: ncs-sdk - url-base: https://github.com/nrfconnect/sdk-nrf + url-base: https://github.com/nrfconnect/ - name: zephyrproject url-base: https://github.com/zephyrproject-rtos + defaults: + remote: sdk-nrf + projects: - name: ncs repo-path: ncs-sdk From 62b05abe39d5871194b16eb5065b10fad239a5ea Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Mon, 27 Mar 2023 16:15:08 +0200 Subject: [PATCH 21/66] okgo --- west.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/west.yml b/west.yml index 4b789b8..b102adb 100644 --- a/west.yml +++ b/west.yml @@ -1,16 +1,16 @@ manifest: remotes: - name: ncs-sdk - url-base: https://github.com/nrfconnect/ + url-base: https://github.com/nrfconnect - name: zephyrproject url-base: https://github.com/zephyrproject-rtos defaults: - remote: sdk-nrf + remote: ncs-sdk projects: - name: ncs - repo-path: ncs-sdk + repo-path: sdk-nrf revision: v2.2.0 import: true - name: hal_atmel From 59473ac904fa01087f537f4d34a9cc57acf19819 Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Mon, 27 Mar 2023 16:23:03 +0200 Subject: [PATCH 22/66] asd --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bfa36c4..4ba0164 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -66,6 +66,7 @@ jobs: - name: Install additional Python dependencies working-directory: myroot run: | + tree # See https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/getting_started/installing.html#install-additional-python-dependencies pip3 install --user -r zephyr/scripts/requirements.txt pip3 install --user -r nrf/scripts/requirements.txt From f9167fb0d6de8399374460540e86bc26699d2653 Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Mon, 27 Mar 2023 16:36:00 +0200 Subject: [PATCH 23/66] tree4 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4ba0164..efa665f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -66,8 +66,8 @@ jobs: - name: Install additional Python dependencies working-directory: myroot run: | - tree # See https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/getting_started/installing.html#install-additional-python-dependencies + tree -L 4 pip3 install --user -r zephyr/scripts/requirements.txt pip3 install --user -r nrf/scripts/requirements.txt pip3 install --user -r bootloader/mcuboot/scripts/requirements.txt From 68bf18b953d3c73a9de0a87c44f13a6f137d583b Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Mon, 27 Mar 2023 16:46:53 +0200 Subject: [PATCH 24/66] proviamo --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index efa665f..5b5f4d6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -58,7 +58,7 @@ jobs: uses: actions/cache/save@v3 with: path: | - - myroot/* + - myroot - !myroot/mycode key: ncs-zephyr-ci-workspace-${{hashFiles('west.yml')}} # west.yml path relative to your github repo id: cache-save-ncs-zephyr-workspace @@ -69,7 +69,7 @@ jobs: # See https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/getting_started/installing.html#install-additional-python-dependencies tree -L 4 pip3 install --user -r zephyr/scripts/requirements.txt - pip3 install --user -r nrf/scripts/requirements.txt + pip3 install --user -r ncs/scripts/requirements.txt pip3 install --user -r bootloader/mcuboot/scripts/requirements.txt - name: Install a toolchain From 10475fdda33ce2267b5b69baea71b5978a6a8b37 Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Mon, 27 Mar 2023 16:59:00 +0200 Subject: [PATCH 25/66] fix cache --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5b5f4d6..9ff51cf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -58,8 +58,8 @@ jobs: uses: actions/cache/save@v3 with: path: | - - myroot - - !myroot/mycode + myroot/* + !myroot/mycode key: ncs-zephyr-ci-workspace-${{hashFiles('west.yml')}} # west.yml path relative to your github repo id: cache-save-ncs-zephyr-workspace From 327e2c40905b1b98aa00aa65d8186428b0b7cdb1 Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Tue, 28 Mar 2023 08:49:04 +0200 Subject: [PATCH 26/66] day2 --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9ff51cf..2d31f6c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -76,12 +76,12 @@ jobs: run: | # See https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/getting_started/installing.html#install-a-toolchain cd ~ - wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v${ZEPHYR_SDK_VERSION}/zephyr-sdk-${ZEPHYR_SDK_VERSION}_linux-x86_64.tar.gz - wget -O - https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v${ZEPHYR_SDK_VERSION}/sha256.sum | shasum --check --ignore-missing - tar xvf zephyr-sdk-${ZEPHYR_SDK_VERSION}_linux-x86_64.tar.gz --directory $HOME/.local - cd $HOME/.local/zephyr-sdk-${ZEPHYR_SDK_VERSION} + wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.15.1/zephyr-sdk-0.15.1_linux-x86_64.tar.gz + wget -O - https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.15.1/sha256.sum | shasum --check --ignore-missing + tar xvf zephyr-sdk-0.15.1_linux-x86_64.tar.gz --directory $HOME/.local + cd $HOME/.local/zephyr-sdk-0.15.1 ./setup.sh - sudo cp ~/zephyr-sdk-${ZEPHYR_SDK_VERSION}/sysroots/x86_64-pokysdk-linux/usr/share/openocd/contrib/60-openocd.rules /etc/udev/rules.d + sudo cp ~/zephyr-sdk-0.15.1/sysroots/x86_64-pokysdk-linux/usr/share/openocd/contrib/60-openocd.rules /etc/udev/rules.d sudo udevadm control --reload - name: Build multicore From b7c55747eb0fa2a4b1109319ee486e6d1eaec6d5 Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Wed, 29 Mar 2023 10:44:40 +0200 Subject: [PATCH 27/66] season4 --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2d31f6c..18fa120 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,7 +39,7 @@ jobs: uses: actions/cache/restore@v3 with: path: myroot - key: ncs-zephyr-ci-workspace-${{hashFiles('west.yml')}} # west.yml path relative to your github repo + key: ncs-zephyr-ci-workspace-${{hashFiles('myroot/mycode/west.yml')}} # west.yml path relative to your github repo id: cache-restore-ncs-zephyr-workspace - name: Get nRF Connect SDK code @@ -60,19 +60,19 @@ jobs: path: | myroot/* !myroot/mycode - key: ncs-zephyr-ci-workspace-${{hashFiles('west.yml')}} # west.yml path relative to your github repo + key: ncs-zephyr-ci-workspace-${{hashFiles('myroot/mycode/west.yml')}} # west.yml path relative to your github repo id: cache-save-ncs-zephyr-workspace - name: Install additional Python dependencies working-directory: myroot run: | # See https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/getting_started/installing.html#install-additional-python-dependencies - tree -L 4 pip3 install --user -r zephyr/scripts/requirements.txt pip3 install --user -r ncs/scripts/requirements.txt pip3 install --user -r bootloader/mcuboot/scripts/requirements.txt - name: Install a toolchain + shell: bash run: | # See https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/getting_started/installing.html#install-a-toolchain cd ~ From 21b648d345f4e9344f5cdd766787e4d48389f922 Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Wed, 29 Mar 2023 11:07:48 +0200 Subject: [PATCH 28/66] cisiamo --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 18fa120..c65d967 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -76,12 +76,12 @@ jobs: run: | # See https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/getting_started/installing.html#install-a-toolchain cd ~ - wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.15.1/zephyr-sdk-0.15.1_linux-x86_64.tar.gz - wget -O - https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.15.1/sha256.sum | shasum --check --ignore-missing - tar xvf zephyr-sdk-0.15.1_linux-x86_64.tar.gz --directory $HOME/.local - cd $HOME/.local/zephyr-sdk-0.15.1 + wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.0/zephyr-sdk-0.16.9_linux-x86_64.tar.gz + wget -O - https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.0/sha256.sum | shasum --check --ignore-missing + tar xvf zephyr-sdk-0.16.0_linux-x86_64.tar.gz --directory $HOME/.local + cd $HOME/.local/zephyr-sdk-0.16.0 ./setup.sh - sudo cp ~/zephyr-sdk-0.15.1/sysroots/x86_64-pokysdk-linux/usr/share/openocd/contrib/60-openocd.rules /etc/udev/rules.d + sudo cp ~/zephyr-sdk-0.16.0/sysroots/x86_64-pokysdk-linux/usr/share/openocd/contrib/60-openocd.rules /etc/udev/rules.d sudo udevadm control --reload - name: Build multicore From 52dbab72b8bd292ae32d20d035bf3259c051bbb9 Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Wed, 29 Mar 2023 11:19:52 +0200 Subject: [PATCH 29/66] okgogoo --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c65d967..fe1108f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -76,7 +76,7 @@ jobs: run: | # See https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/getting_started/installing.html#install-a-toolchain cd ~ - wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.0/zephyr-sdk-0.16.9_linux-x86_64.tar.gz + wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.0/zephyr-sdk-0.16.0_linux-x86_64.tar.gz wget -O - https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.0/sha256.sum | shasum --check --ignore-missing tar xvf zephyr-sdk-0.16.0_linux-x86_64.tar.gz --directory $HOME/.local cd $HOME/.local/zephyr-sdk-0.16.0 From fa00f35dcff1d82a119e3cdd7b7fe7566f577a33 Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Wed, 29 Mar 2023 11:28:55 +0200 Subject: [PATCH 30/66] mannaggiazepgyr --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fe1108f..07f1cbc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -76,7 +76,7 @@ jobs: run: | # See https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/getting_started/installing.html#install-a-toolchain cd ~ - wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.0/zephyr-sdk-0.16.0_linux-x86_64.tar.gz + wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.0/zephyr-sdk-0.16.0_linux-x86_64.tar.xz wget -O - https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.0/sha256.sum | shasum --check --ignore-missing tar xvf zephyr-sdk-0.16.0_linux-x86_64.tar.gz --directory $HOME/.local cd $HOME/.local/zephyr-sdk-0.16.0 From 9f619551532dd088b2c150534c860121c4f25c35 Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Wed, 29 Mar 2023 11:35:55 +0200 Subject: [PATCH 31/66] bastaa --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 07f1cbc..737ae29 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,7 +39,7 @@ jobs: uses: actions/cache/restore@v3 with: path: myroot - key: ncs-zephyr-ci-workspace-${{hashFiles('myroot/mycode/west.yml')}} # west.yml path relative to your github repo + key: ncs-zephyr-ci-workspace-${{hashFiles('myroot/mycode/west.yml')}} id: cache-restore-ncs-zephyr-workspace - name: Get nRF Connect SDK code @@ -60,7 +60,7 @@ jobs: path: | myroot/* !myroot/mycode - key: ncs-zephyr-ci-workspace-${{hashFiles('myroot/mycode/west.yml')}} # west.yml path relative to your github repo + key: ncs-zephyr-ci-workspace-${{hashFiles('myroot/mycode/west.yml')}} id: cache-save-ncs-zephyr-workspace - name: Install additional Python dependencies @@ -78,7 +78,7 @@ jobs: cd ~ wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.0/zephyr-sdk-0.16.0_linux-x86_64.tar.xz wget -O - https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.0/sha256.sum | shasum --check --ignore-missing - tar xvf zephyr-sdk-0.16.0_linux-x86_64.tar.gz --directory $HOME/.local + tar xvf zephyr-sdk-0.16.0_linux-x86_64.tar.xz --directory $HOME/.local cd $HOME/.local/zephyr-sdk-0.16.0 ./setup.sh sudo cp ~/zephyr-sdk-0.16.0/sysroots/x86_64-pokysdk-linux/usr/share/openocd/contrib/60-openocd.rules /etc/udev/rules.d From 820fbefb802e36d45f179682dcbeee3f822dfb83 Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Wed, 29 Mar 2023 11:58:43 +0200 Subject: [PATCH 32/66] seasonfinale?!? --- .github/workflows/build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 737ae29..f2aa8af 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -76,12 +76,12 @@ jobs: run: | # See https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/getting_started/installing.html#install-a-toolchain cd ~ - wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.0/zephyr-sdk-0.16.0_linux-x86_64.tar.xz - wget -O - https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.0/sha256.sum | shasum --check --ignore-missing - tar xvf zephyr-sdk-0.16.0_linux-x86_64.tar.xz --directory $HOME/.local - cd $HOME/.local/zephyr-sdk-0.16.0 - ./setup.sh - sudo cp ~/zephyr-sdk-0.16.0/sysroots/x86_64-pokysdk-linux/usr/share/openocd/contrib/60-openocd.rules /etc/udev/rules.d + wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.15.1/zephyr-sdk-0.15.1_linux-x86_64.tar.gz + wget -O - https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.15.1/sha256.sum | shasum --check --ignore-missing + tar xvf zephyr-sdk-0.15.1_linux-x86_64.tar.gz --directory $HOME/.local + cd $HOME/.local/zephyr-sdk-0.15.1 + ./setup.sh -t all -h -c + sudo cp ~/zephyr-sdk-0.15.1/sysroots/x86_64-pokysdk-linux/usr/share/openocd/contrib/60-openocd.rules /etc/udev/rules.d sudo udevadm control --reload - name: Build multicore From e3615f202c2ad82b951ac1673dc238543644449d Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Wed, 29 Mar 2023 12:08:26 +0200 Subject: [PATCH 33/66] okdai --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f2aa8af..e91fa0b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -81,7 +81,7 @@ jobs: tar xvf zephyr-sdk-0.15.1_linux-x86_64.tar.gz --directory $HOME/.local cd $HOME/.local/zephyr-sdk-0.15.1 ./setup.sh -t all -h -c - sudo cp ~/zephyr-sdk-0.15.1/sysroots/x86_64-pokysdk-linux/usr/share/openocd/contrib/60-openocd.rules /etc/udev/rules.d + sudo cp ~/.local/zephyr-sdk-0.15.1/sysroots/x86_64-pokysdk-linux/usr/share/openocd/contrib/60-openocd.rules /etc/udev/rules.d sudo udevadm control --reload - name: Build multicore From 55fbf341f587c71a335a2407ff2f3b19de9a70bd Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Wed, 29 Mar 2023 12:18:16 +0200 Subject: [PATCH 34/66] nonnepozzchiu --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e91fa0b..710733d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -85,10 +85,10 @@ jobs: sudo udevadm control --reload - name: Build multicore - working-directory: myroot + working-directory: myroot/mycode run: | # Setup command line build env source zephyr/zephyr-env.sh - west build --build-dir multicore\build multicore --pristine \ + west build --build-dir multicore/build multicore --pristine \ --board nrf5340dk_nrf5340_cpuapp -- -DNCS_TOOLCHAIN_VERSION:STRING="NONE" \ -DCONF_FILE:STRING="multicore/prj.conf" From 253a3629fe621575d7e8124647a9a4ba9d0c0290 Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Wed, 29 Mar 2023 12:26:18 +0200 Subject: [PATCH 35/66] lastone --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 710733d..3c01343 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -85,10 +85,10 @@ jobs: sudo udevadm control --reload - name: Build multicore - working-directory: myroot/mycode + working-directory: myroot run: | # Setup command line build env source zephyr/zephyr-env.sh - west build --build-dir multicore/build multicore --pristine \ + west build --build-dir mycode/multicore/build multicore --pristine \ --board nrf5340dk_nrf5340_cpuapp -- -DNCS_TOOLCHAIN_VERSION:STRING="NONE" \ -DCONF_FILE:STRING="multicore/prj.conf" From 0f8c6310bcc3c7da871526ff711d6ced02b43399 Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Wed, 29 Mar 2023 12:39:34 +0200 Subject: [PATCH 36/66] perfavire --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3c01343..54b7490 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,7 +36,7 @@ jobs: source ~/.bashrc - name: Restore cached west workspace - uses: actions/cache/restore@v3 + uses: actions/cache/restore@v3.3.1 with: path: myroot key: ncs-zephyr-ci-workspace-${{hashFiles('myroot/mycode/west.yml')}} @@ -55,7 +55,7 @@ jobs: - name: Save cached west workspace if: ${{ steps.cache-restore-ncs-zephyr-workspace.outputs.cache-hit != 'true' }} - uses: actions/cache/save@v3 + uses: actions/cache/save@v3.3.1 with: path: | myroot/* @@ -89,6 +89,6 @@ jobs: run: | # Setup command line build env source zephyr/zephyr-env.sh - west build --build-dir mycode/multicore/build multicore --pristine \ + west build --build-dir mycode/multicore/build mycode/multicore --pristine \ --board nrf5340dk_nrf5340_cpuapp -- -DNCS_TOOLCHAIN_VERSION:STRING="NONE" \ -DCONF_FILE:STRING="multicore/prj.conf" From 1d05e984b3fcc81548ac5066436610db7dc845fc Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Wed, 29 Mar 2023 12:53:41 +0200 Subject: [PATCH 37/66] daitiprego --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 54b7490..6b725ea 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -91,4 +91,4 @@ jobs: source zephyr/zephyr-env.sh west build --build-dir mycode/multicore/build mycode/multicore --pristine \ --board nrf5340dk_nrf5340_cpuapp -- -DNCS_TOOLCHAIN_VERSION:STRING="NONE" \ - -DCONF_FILE:STRING="multicore/prj.conf" + -DCONF_FILE:STRING="mycode/multicore/prj.conf" From 426f31b8d72376b493d20d0852e66ab5875b9a79 Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Wed, 29 Mar 2023 13:04:57 +0200 Subject: [PATCH 38/66] proviamo --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6b725ea..9898f75 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -91,4 +91,4 @@ jobs: source zephyr/zephyr-env.sh west build --build-dir mycode/multicore/build mycode/multicore --pristine \ --board nrf5340dk_nrf5340_cpuapp -- -DNCS_TOOLCHAIN_VERSION:STRING="NONE" \ - -DCONF_FILE:STRING="mycode/multicore/prj.conf" + -DCONF_FILE:STRING="prj.conf" From 8e62d45b629d1efc17c30cba20ce57ce1662ec5b Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Mon, 3 Apr 2023 14:55:43 +0200 Subject: [PATCH 39/66] andiamo --- .github/workflows/build.yml | 2 +- west.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9898f75..82dc39a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -68,7 +68,7 @@ jobs: run: | # See https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/getting_started/installing.html#install-additional-python-dependencies pip3 install --user -r zephyr/scripts/requirements.txt - pip3 install --user -r ncs/scripts/requirements.txt + pip3 install --user -r nrf/scripts/requirements.txt pip3 install --user -r bootloader/mcuboot/scripts/requirements.txt - name: Install a toolchain diff --git a/west.yml b/west.yml index b102adb..6a8aff1 100644 --- a/west.yml +++ b/west.yml @@ -9,7 +9,7 @@ manifest: remote: ncs-sdk projects: - - name: ncs + - name: nrf repo-path: sdk-nrf revision: v2.2.0 import: true From 580d68daa61aeec6e6c88d18e0b92fb0c1274dd8 Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Mon, 3 Apr 2023 15:08:28 +0200 Subject: [PATCH 40/66] clonedephtt --- west.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/west.yml b/west.yml index 6a8aff1..f9a6019 100644 --- a/west.yml +++ b/west.yml @@ -12,9 +12,11 @@ manifest: - name: nrf repo-path: sdk-nrf revision: v2.2.0 + clone-depth: 1 import: true - name: hal_atmel remote: zephyrproject + clone-depth: 1 path: modules/hal/atmel revision: master groups: From 2a8bec5e536ef6d24a8c0d59aeb9d80396385813 Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Mon, 3 Apr 2023 15:43:46 +0200 Subject: [PATCH 41/66] dai Co-authored-by: Riccardo Grieco --- .github/workflows/build.yml | 53 ++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 82dc39a..a01659e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,6 @@ jobs: steps: - uses: actions/checkout@v3 with: - fetch-depth: 0 path: myroot/mycode - name: Installing required tools @@ -35,15 +34,26 @@ jobs: echo 'export PATH=~/.local/bin:"$PATH"' >> ~/.bashrc source ~/.bashrc + #- name: Restore cached west workspace + # uses: actions/cache/restore@v3.3.1 + # with: + # path: myroot + # key: ncs-zephyr-ci-workspace-${{hashFiles('myroot/mycode/west.yml')}} + # id: cache-restore-ncs-zephyr-workspace - name: Restore cached west workspace - uses: actions/cache/restore@v3.3.1 + uses: actions/download-artifacts@v3 with: - path: myroot - key: ncs-zephyr-ci-workspace-${{hashFiles('myroot/mycode/west.yml')}} - id: cache-restore-ncs-zephyr-workspace + name: 'ncs-${{hashFiles('myroot/mycode/west.yml')}}' + path: tmp + id: artifacts-download-ncs-zephyr-workspace + continue-on-error: true + + - name: Unzip cached west workspace + if: ${{steps.artifacts-download-ncs-zephyr-workspace.conclusion == 'success'}} + run: tar -xf tmp/ncs-zephyr-${{hashFiles('myroot/mycode/west.yml')}}.tgz -C myroot - name: Get nRF Connect SDK code - if: ${{ steps.cache-restore-ncs-zephyr-workspace.outputs.cache-hit != 'true' }} + if: ${{steps.artifacts-download-ncs-zephyr-workspace.conclusion != 'successs' }} run: | # See https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/getting_started/installing.html#get-the-ncs-code cd myroot @@ -51,17 +61,30 @@ jobs: west init -l mycode echo "west update" west update - west zephyr-export - - name: Save cached west workspace - if: ${{ steps.cache-restore-ncs-zephyr-workspace.outputs.cache-hit != 'true' }} - uses: actions/cache/save@v3.3.1 + #- name: Save cached west workspace + # if: ${{ steps.cache-restore-ncs-zephyr-workspace.outputs.cache-hit != 'true' }} + # uses: actions/cache/save@v3.3.1 + # with: + # path: | + # myroot/* + # !myroot/mycode + # key: ncs-zephyr-ci-workspace-${{hashFiles('myroot/mycode/west.yml')}} + # id: cache-save-ncs-zephyr-workspace + + - name: Zip west workspace + if: ${{steps.artifacts-download-ncs-zephyr-workspace.conclusion != 'success' }} + run: tar --exclude='myroot/mycode' -zcvf tmp/ncs-zephyr-${{hashFiles('myroot/mycode/west.yml')}}.tgz myroot + id: zip-ncs-zephyr + + - name: Upload zipped west workspace + if: ${{steps.zip-ncs-zephyr.conclusion == 'success'}} with: - path: | - myroot/* - !myroot/mycode - key: ncs-zephyr-ci-workspace-${{hashFiles('myroot/mycode/west.yml')}} - id: cache-save-ncs-zephyr-workspace + name: 'ncs-${{hashFiles('myroot/mycode/west.yml')}}' + path: tmp/ncs-zephyr-${{hashFiles('myroot/mycode/west.yml')}}.tgz + + - name: Export zephyr CMake packages + run: west zephyr-export - name: Install additional Python dependencies working-directory: myroot From e7e2a1e41d631a948a7bd79e75c30d57ab5e45ae Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Mon, 3 Apr 2023 15:46:37 +0200 Subject: [PATCH 42/66] oknow --- .github/workflows/build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a01659e..3bc27ce 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,11 +42,11 @@ jobs: # id: cache-restore-ncs-zephyr-workspace - name: Restore cached west workspace uses: actions/download-artifacts@v3 + id: artifacts-download-ncs-zephyr-workspace + continue-on-error: true with: name: 'ncs-${{hashFiles('myroot/mycode/west.yml')}}' path: tmp - id: artifacts-download-ncs-zephyr-workspace - continue-on-error: true - name: Unzip cached west workspace if: ${{steps.artifacts-download-ncs-zephyr-workspace.conclusion == 'success'}} @@ -79,6 +79,7 @@ jobs: - name: Upload zipped west workspace if: ${{steps.zip-ncs-zephyr.conclusion == 'success'}} + uses: actions/upload-artifacts@v3 with: name: 'ncs-${{hashFiles('myroot/mycode/west.yml')}}' path: tmp/ncs-zephyr-${{hashFiles('myroot/mycode/west.yml')}}.tgz From 757b81aed4795a827ead3d0e92fee6130fb0a9f0 Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Mon, 3 Apr 2023 15:47:59 +0200 Subject: [PATCH 43/66] proviamoo --- .github/workflows/build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3bc27ce..2f177a6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,12 +40,13 @@ jobs: # path: myroot # key: ncs-zephyr-ci-workspace-${{hashFiles('myroot/mycode/west.yml')}} # id: cache-restore-ncs-zephyr-workspace + - name: Restore cached west workspace uses: actions/download-artifacts@v3 id: artifacts-download-ncs-zephyr-workspace continue-on-error: true with: - name: 'ncs-${{hashFiles('myroot/mycode/west.yml')}}' + name: ncs-${{hashFiles('myroot/mycode/west.yml')}} path: tmp - name: Unzip cached west workspace @@ -81,7 +82,7 @@ jobs: if: ${{steps.zip-ncs-zephyr.conclusion == 'success'}} uses: actions/upload-artifacts@v3 with: - name: 'ncs-${{hashFiles('myroot/mycode/west.yml')}}' + name: ncs-${{hashFiles('myroot/mycode/west.yml')}} path: tmp/ncs-zephyr-${{hashFiles('myroot/mycode/west.yml')}}.tgz - name: Export zephyr CMake packages From 05d89451fa19b5f52d6b8f93f836cd15f47ab0de Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Mon, 3 Apr 2023 15:49:00 +0200 Subject: [PATCH 44/66] oops --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2f177a6..4908ec7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,7 +42,7 @@ jobs: # id: cache-restore-ncs-zephyr-workspace - name: Restore cached west workspace - uses: actions/download-artifacts@v3 + uses: actions/download-artifact@v3 id: artifacts-download-ncs-zephyr-workspace continue-on-error: true with: @@ -80,7 +80,7 @@ jobs: - name: Upload zipped west workspace if: ${{steps.zip-ncs-zephyr.conclusion == 'success'}} - uses: actions/upload-artifacts@v3 + uses: actions/upload-artifact@v3 with: name: ncs-${{hashFiles('myroot/mycode/west.yml')}} path: tmp/ncs-zephyr-${{hashFiles('myroot/mycode/west.yml')}}.tgz From 34f69ed6df94d07b83903e756ed5dc9e25ab28f6 Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Mon, 3 Apr 2023 15:53:26 +0200 Subject: [PATCH 45/66] siva --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4908ec7..0402ca8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,11 +50,11 @@ jobs: path: tmp - name: Unzip cached west workspace - if: ${{steps.artifacts-download-ncs-zephyr-workspace.conclusion == 'success'}} + if: ${{steps.artifacts-download-ncs-zephyr-workspace.outcome == 'success'}} run: tar -xf tmp/ncs-zephyr-${{hashFiles('myroot/mycode/west.yml')}}.tgz -C myroot - name: Get nRF Connect SDK code - if: ${{steps.artifacts-download-ncs-zephyr-workspace.conclusion != 'successs' }} + if: ${{steps.artifacts-download-ncs-zephyr-workspace.outcome != 'successs' }} run: | # See https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/getting_started/installing.html#get-the-ncs-code cd myroot @@ -74,12 +74,12 @@ jobs: # id: cache-save-ncs-zephyr-workspace - name: Zip west workspace - if: ${{steps.artifacts-download-ncs-zephyr-workspace.conclusion != 'success' }} + if: ${{steps.artifacts-download-ncs-zephyr-workspace.outcome= 'success' }} run: tar --exclude='myroot/mycode' -zcvf tmp/ncs-zephyr-${{hashFiles('myroot/mycode/west.yml')}}.tgz myroot id: zip-ncs-zephyr - name: Upload zipped west workspace - if: ${{steps.zip-ncs-zephyr.conclusion == 'success'}} + if: ${{steps.zip-ncs-zephyr.outcome == 'success'}} uses: actions/upload-artifact@v3 with: name: ncs-${{hashFiles('myroot/mycode/west.yml')}} From ea4f071f6d3382f32d2c79d85f61de7f39a411cb Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Mon, 3 Apr 2023 15:54:52 +0200 Subject: [PATCH 46/66] avevamosbagliato --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0402ca8..7c60879 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -74,7 +74,7 @@ jobs: # id: cache-save-ncs-zephyr-workspace - name: Zip west workspace - if: ${{steps.artifacts-download-ncs-zephyr-workspace.outcome= 'success' }} + if: ${{steps.artifacts-download-ncs-zephyr-workspace.outcome == 'success' }} run: tar --exclude='myroot/mycode' -zcvf tmp/ncs-zephyr-${{hashFiles('myroot/mycode/west.yml')}}.tgz myroot id: zip-ncs-zephyr From 2b005b9f15fdee9680943f517cc04a17c632d6f1 Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Mon, 3 Apr 2023 16:01:07 +0200 Subject: [PATCH 47/66] erasbagl --- .github/workflows/build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7c60879..05fe4d6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -54,7 +54,7 @@ jobs: run: tar -xf tmp/ncs-zephyr-${{hashFiles('myroot/mycode/west.yml')}}.tgz -C myroot - name: Get nRF Connect SDK code - if: ${{steps.artifacts-download-ncs-zephyr-workspace.outcome != 'successs' }} + if: ${{steps.artifacts-download-ncs-zephyr-workspace.outcome != 'success' }} run: | # See https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/getting_started/installing.html#get-the-ncs-code cd myroot @@ -74,7 +74,7 @@ jobs: # id: cache-save-ncs-zephyr-workspace - name: Zip west workspace - if: ${{steps.artifacts-download-ncs-zephyr-workspace.outcome == 'success' }} + if: ${{steps.artifacts-download-ncs-zephyr-workspace.outcome != 'success' }} run: tar --exclude='myroot/mycode' -zcvf tmp/ncs-zephyr-${{hashFiles('myroot/mycode/west.yml')}}.tgz myroot id: zip-ncs-zephyr @@ -86,6 +86,7 @@ jobs: path: tmp/ncs-zephyr-${{hashFiles('myroot/mycode/west.yml')}}.tgz - name: Export zephyr CMake packages + working-directoty: myroot run: west zephyr-export - name: Install additional Python dependencies From bf0bd3b3171a1c0688e75fd8750f1f4fe63940d3 Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Mon, 3 Apr 2023 16:03:36 +0200 Subject: [PATCH 48/66] typofix --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 05fe4d6..58e0435 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -86,7 +86,7 @@ jobs: path: tmp/ncs-zephyr-${{hashFiles('myroot/mycode/west.yml')}}.tgz - name: Export zephyr CMake packages - working-directoty: myroot + working-directory: myroot run: west zephyr-export - name: Install additional Python dependencies From 27d3373af08b44ea7957635adbe5ab421c9197f5 Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Mon, 3 Apr 2023 16:11:46 +0200 Subject: [PATCH 49/66] tarfix --- .github/workflows/build.yml | 6 ++++-- .vscode/settings.json | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 58e0435..9c2ed12 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ jobs: sudo bash kitware-archive.sh # Install dependencies sudo apt install --no-install-recommends git cmake ninja-build gperf \ - ccache dfu-util device-tree-compiler wget \ + ccache dfu-util device-tree-compiler \ python3-dev python3-pip python3-setuptools python3-tk python3-wheel xz-utils file \ make gcc gcc-multilib g++-multilib libsdl2-dev libmagic1 @@ -75,7 +75,9 @@ jobs: - name: Zip west workspace if: ${{steps.artifacts-download-ncs-zephyr-workspace.outcome != 'success' }} - run: tar --exclude='myroot/mycode' -zcvf tmp/ncs-zephyr-${{hashFiles('myroot/mycode/west.yml')}}.tgz myroot + run: | + mkdir tmp + tar --exclude='myroot/mycode' -zcvf tmp/ncs-zephyr-${{hashFiles('myroot/mycode/west.yml')}}.tgz myroot id: zip-ncs-zephyr - name: Upload zipped west workspace diff --git a/.vscode/settings.json b/.vscode/settings.json index 9c317c7..06812dd 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,7 @@ { "nrf-connect.topdir": "${nrf-connect.sdk:2.0.2}", - "nrf-connect.toolchain.path": "${nrf-connect.toolchain:2.0.2}" + "nrf-connect.toolchain.path": "${nrf-connect.toolchain:2.0.2}", + "nrf-connect.applications": [ + "${workspaceFolder}\\multicore" + ] } \ No newline at end of file From 9b61eda48948568e009bc467fd2244cbf2596af2 Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Mon, 3 Apr 2023 16:25:16 +0200 Subject: [PATCH 50/66] ritorniamoindietro --- .github/workflows/build.yml | 74 ++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9c2ed12..4ba4688 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,24 +34,24 @@ jobs: echo 'export PATH=~/.local/bin:"$PATH"' >> ~/.bashrc source ~/.bashrc - #- name: Restore cached west workspace - # uses: actions/cache/restore@v3.3.1 - # with: - # path: myroot - # key: ncs-zephyr-ci-workspace-${{hashFiles('myroot/mycode/west.yml')}} - # id: cache-restore-ncs-zephyr-workspace - - name: Restore cached west workspace - uses: actions/download-artifact@v3 - id: artifacts-download-ncs-zephyr-workspace - continue-on-error: true - with: - name: ncs-${{hashFiles('myroot/mycode/west.yml')}} - path: tmp + uses: actions/cache/restore@v3.3.1 + with: + path: myroot + key: ncs-zephyr-ci-workspace-${{hashFiles('myroot/mycode/west.yml')}} + id: cache-restore-ncs-zephyr-workspace + + # - name: Restore cached west workspace + # uses: actions/download-artifact@v3 + # id: artifacts-download-ncs-zephyr-workspace + # continue-on-error: true + # with: + # name: ncs-${{hashFiles('myroot/mycode/west.yml')}} + # path: tmp - - name: Unzip cached west workspace - if: ${{steps.artifacts-download-ncs-zephyr-workspace.outcome == 'success'}} - run: tar -xf tmp/ncs-zephyr-${{hashFiles('myroot/mycode/west.yml')}}.tgz -C myroot + # - name: Unzip cached west workspace + # if: ${{steps.artifacts-download-ncs-zephyr-workspace.outcome == 'success'}} + # run: tar -xf tmp/ncs-zephyr-${{hashFiles('myroot/mycode/west.yml')}}.tgz -C myroot - name: Get nRF Connect SDK code if: ${{steps.artifacts-download-ncs-zephyr-workspace.outcome != 'success' }} @@ -63,29 +63,29 @@ jobs: echo "west update" west update - #- name: Save cached west workspace - # if: ${{ steps.cache-restore-ncs-zephyr-workspace.outputs.cache-hit != 'true' }} - # uses: actions/cache/save@v3.3.1 - # with: - # path: | - # myroot/* - # !myroot/mycode - # key: ncs-zephyr-ci-workspace-${{hashFiles('myroot/mycode/west.yml')}} - # id: cache-save-ncs-zephyr-workspace + - name: Save cached west workspace + if: ${{ steps.cache-restore-ncs-zephyr-workspace.outputs.cache-hit != 'true' }} + uses: actions/cache/save@v3.3.1 + with: + path: | + myroot/* + !myroot/mycode + key: ncs-zephyr-ci-workspace-${{hashFiles('myroot/mycode/west.yml')}} + id: cache-save-ncs-zephyr-workspace - - name: Zip west workspace - if: ${{steps.artifacts-download-ncs-zephyr-workspace.outcome != 'success' }} - run: | - mkdir tmp - tar --exclude='myroot/mycode' -zcvf tmp/ncs-zephyr-${{hashFiles('myroot/mycode/west.yml')}}.tgz myroot - id: zip-ncs-zephyr + # - name: Zip west workspace + # if: ${{steps.artifacts-download-ncs-zephyr-workspace.outcome != 'success' }} + # run: | + # mkdir tmp + # tar --exclude='myroot/mycode' -zcvf tmp/ncs-zephyr-${{hashFiles('myroot/mycode/west.yml')}}.tgz myroot + # id: zip-ncs-zephyr - - name: Upload zipped west workspace - if: ${{steps.zip-ncs-zephyr.outcome == 'success'}} - uses: actions/upload-artifact@v3 - with: - name: ncs-${{hashFiles('myroot/mycode/west.yml')}} - path: tmp/ncs-zephyr-${{hashFiles('myroot/mycode/west.yml')}}.tgz + # - name: Upload zipped west workspace + # if: ${{steps.zip-ncs-zephyr.outcome == 'success'}} + # uses: actions/upload-artifact@v3 + # with: + # name: ncs-${{hashFiles('myroot/mycode/west.yml')}} + # path: tmp/ncs-zephyr-${{hashFiles('myroot/mycode/west.yml')}}.tgz - name: Export zephyr CMake packages working-directory: myroot From 3c00ec9b48ad8c8d285f921a359b908b69bc78f3 Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Mon, 3 Apr 2023 16:29:29 +0200 Subject: [PATCH 51/66] fix --- .github/workflows/build.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4ba4688..1222ad5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,11 +35,11 @@ jobs: source ~/.bashrc - name: Restore cached west workspace - uses: actions/cache/restore@v3.3.1 - with: - path: myroot - key: ncs-zephyr-ci-workspace-${{hashFiles('myroot/mycode/west.yml')}} - id: cache-restore-ncs-zephyr-workspace + uses: actions/cache/restore@v3.3.1 + with: + path: myroot + key: ncs-zephyr-ci-workspace-${{hashFiles('myroot/mycode/west.yml')}} + id: cache-restore-ncs-zephyr-workspace # - name: Restore cached west workspace # uses: actions/download-artifact@v3 @@ -64,14 +64,14 @@ jobs: west update - name: Save cached west workspace - if: ${{ steps.cache-restore-ncs-zephyr-workspace.outputs.cache-hit != 'true' }} - uses: actions/cache/save@v3.3.1 - with: - path: | - myroot/* - !myroot/mycode - key: ncs-zephyr-ci-workspace-${{hashFiles('myroot/mycode/west.yml')}} - id: cache-save-ncs-zephyr-workspace + if: ${{ steps.cache-restore-ncs-zephyr-workspace.outputs.cache-hit != 'true' }} + uses: actions/cache/save@v3.3.1 + with: + path: | + myroot/* + !myroot/mycode + key: ncs-zephyr-ci-workspace-${{hashFiles('myroot/mycode/west.yml')}} + id: cache-save-ncs-zephyr-workspace # - name: Zip west workspace # if: ${{steps.artifacts-download-ncs-zephyr-workspace.outcome != 'success' }} From 77027d0a3598847257bd92cf94b22f0284a1167f Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Fri, 14 Apr 2023 09:20:50 +0200 Subject: [PATCH 52/66] runjob --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1222ad5..2157b3d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -120,3 +120,5 @@ jobs: west build --build-dir mycode/multicore/build mycode/multicore --pristine \ --board nrf5340dk_nrf5340_cpuapp -- -DNCS_TOOLCHAIN_VERSION:STRING="NONE" \ -DCONF_FILE:STRING="prj.conf" + + \ No newline at end of file From dec94d20df8ebb56b0a5305e3d5462bba215b171 Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Fri, 14 Apr 2023 09:33:29 +0200 Subject: [PATCH 53/66] provarestore --- .github/workflows/build.yml | 4 +--- multicore/src/main.c | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2157b3d..1cc66e9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -119,6 +119,4 @@ jobs: source zephyr/zephyr-env.sh west build --build-dir mycode/multicore/build mycode/multicore --pristine \ --board nrf5340dk_nrf5340_cpuapp -- -DNCS_TOOLCHAIN_VERSION:STRING="NONE" \ - -DCONF_FILE:STRING="prj.conf" - - \ No newline at end of file + -DCONF_FILE:STRING="prj.conf" \ No newline at end of file diff --git a/multicore/src/main.c b/multicore/src/main.c index 3a2d3fb..692d6e8 100644 --- a/multicore/src/main.c +++ b/multicore/src/main.c @@ -12,6 +12,7 @@ int main(void) printk("Hello world from %s\n", CONFIG_BOARD); printk("Hello world from %s\n", CONFIG_BOARD); printk("Hello world from %s\n", CONFIG_BOARD); + int a = 1; return 0; } From 40d57b629e51fdafb104d0ab1642f432c8c33624 Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Fri, 14 Apr 2023 09:52:45 +0200 Subject: [PATCH 54/66] provacache --- .github/workflows/build.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1cc66e9..0eba466 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -62,14 +62,17 @@ jobs: west init -l mycode echo "west update" west update + echo "Stringa test">prova/test.txt - name: Save cached west workspace if: ${{ steps.cache-restore-ncs-zephyr-workspace.outputs.cache-hit != 'true' }} uses: actions/cache/save@v3.3.1 with: - path: | - myroot/* - !myroot/mycode + # path: | + # myroot/* + # !myroot/mycode + path: | + myroot/prova/test.txt key: ncs-zephyr-ci-workspace-${{hashFiles('myroot/mycode/west.yml')}} id: cache-save-ncs-zephyr-workspace @@ -119,4 +122,4 @@ jobs: source zephyr/zephyr-env.sh west build --build-dir mycode/multicore/build mycode/multicore --pristine \ --board nrf5340dk_nrf5340_cpuapp -- -DNCS_TOOLCHAIN_VERSION:STRING="NONE" \ - -DCONF_FILE:STRING="prj.conf" \ No newline at end of file + -DCONF_FILE:STRING="prj.conf" From 64b5bb368f3d662ef6de3da5087187dd0993ab9a Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Fri, 14 Apr 2023 10:03:41 +0200 Subject: [PATCH 55/66] testsizecache --- .github/workflows/build.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0eba466..fdc3213 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,7 +37,8 @@ jobs: - name: Restore cached west workspace uses: actions/cache/restore@v3.3.1 with: - path: myroot + #path: myroot + path: provacache key: ncs-zephyr-ci-workspace-${{hashFiles('myroot/mycode/west.yml')}} id: cache-restore-ncs-zephyr-workspace @@ -62,7 +63,11 @@ jobs: west init -l mycode echo "west update" west update - echo "Stringa test">prova/test.txt + + - name: Test file cache + run: | + mkdir provacache + echo "provaprova" > provacache/prova.txt - name: Save cached west workspace if: ${{ steps.cache-restore-ncs-zephyr-workspace.outputs.cache-hit != 'true' }} @@ -71,8 +76,7 @@ jobs: # path: | # myroot/* # !myroot/mycode - path: | - myroot/prova/test.txt + path: provacache key: ncs-zephyr-ci-workspace-${{hashFiles('myroot/mycode/west.yml')}} id: cache-save-ncs-zephyr-workspace From 18bfe38c8c43c92d533c4c19954f64aa9611eeb4 Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Fri, 14 Apr 2023 10:14:53 +0200 Subject: [PATCH 56/66] provasize --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fdc3213..964c306 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -127,3 +127,4 @@ jobs: west build --build-dir mycode/multicore/build mycode/multicore --pristine \ --board nrf5340dk_nrf5340_cpuapp -- -DNCS_TOOLCHAIN_VERSION:STRING="NONE" \ -DCONF_FILE:STRING="prj.conf" + From bfda53aa11c9d6ac65b1a16c32f7d36b773c63f8 Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Fri, 14 Apr 2023 10:19:53 +0200 Subject: [PATCH 57/66] First Run --- .github/workflows/build.yml | 42 ++++--------------------------------- 1 file changed, 4 insertions(+), 38 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 964c306..183da70 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,22 +37,9 @@ jobs: - name: Restore cached west workspace uses: actions/cache/restore@v3.3.1 with: - #path: myroot - path: provacache + path: myroot key: ncs-zephyr-ci-workspace-${{hashFiles('myroot/mycode/west.yml')}} id: cache-restore-ncs-zephyr-workspace - - # - name: Restore cached west workspace - # uses: actions/download-artifact@v3 - # id: artifacts-download-ncs-zephyr-workspace - # continue-on-error: true - # with: - # name: ncs-${{hashFiles('myroot/mycode/west.yml')}} - # path: tmp - - # - name: Unzip cached west workspace - # if: ${{steps.artifacts-download-ncs-zephyr-workspace.outcome == 'success'}} - # run: tar -xf tmp/ncs-zephyr-${{hashFiles('myroot/mycode/west.yml')}}.tgz -C myroot - name: Get nRF Connect SDK code if: ${{steps.artifacts-download-ncs-zephyr-workspace.outcome != 'success' }} @@ -64,36 +51,16 @@ jobs: echo "west update" west update - - name: Test file cache - run: | - mkdir provacache - echo "provaprova" > provacache/prova.txt - - name: Save cached west workspace if: ${{ steps.cache-restore-ncs-zephyr-workspace.outputs.cache-hit != 'true' }} uses: actions/cache/save@v3.3.1 with: - # path: | - # myroot/* - # !myroot/mycode - path: provacache + path: | + myroot/* + !myroot/mycode key: ncs-zephyr-ci-workspace-${{hashFiles('myroot/mycode/west.yml')}} id: cache-save-ncs-zephyr-workspace - # - name: Zip west workspace - # if: ${{steps.artifacts-download-ncs-zephyr-workspace.outcome != 'success' }} - # run: | - # mkdir tmp - # tar --exclude='myroot/mycode' -zcvf tmp/ncs-zephyr-${{hashFiles('myroot/mycode/west.yml')}}.tgz myroot - # id: zip-ncs-zephyr - - # - name: Upload zipped west workspace - # if: ${{steps.zip-ncs-zephyr.outcome == 'success'}} - # uses: actions/upload-artifact@v3 - # with: - # name: ncs-${{hashFiles('myroot/mycode/west.yml')}} - # path: tmp/ncs-zephyr-${{hashFiles('myroot/mycode/west.yml')}}.tgz - - name: Export zephyr CMake packages working-directory: myroot run: west zephyr-export @@ -127,4 +94,3 @@ jobs: west build --build-dir mycode/multicore/build mycode/multicore --pristine \ --board nrf5340dk_nrf5340_cpuapp -- -DNCS_TOOLCHAIN_VERSION:STRING="NONE" \ -DCONF_FILE:STRING="prj.conf" - From f0137f52a73870234293a380d247c571e5820760 Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Fri, 14 Apr 2023 10:22:43 +0200 Subject: [PATCH 58/66] First Run --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 183da70..d316b1e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -55,9 +55,9 @@ jobs: if: ${{ steps.cache-restore-ncs-zephyr-workspace.outputs.cache-hit != 'true' }} uses: actions/cache/save@v3.3.1 with: - path: | - myroot/* - !myroot/mycode + path: | + myroot/* + !myroot/mycode key: ncs-zephyr-ci-workspace-${{hashFiles('myroot/mycode/west.yml')}} id: cache-save-ncs-zephyr-workspace From 269a36ae53433c41568998624c2b4c25fc91bc93 Mon Sep 17 00:00:00 2001 From: Dario Sortino Date: Fri, 14 Apr 2023 10:34:55 +0200 Subject: [PATCH 59/66] Second Run --- multicore/src/main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/multicore/src/main.c b/multicore/src/main.c index 692d6e8..3a2d3fb 100644 --- a/multicore/src/main.c +++ b/multicore/src/main.c @@ -12,7 +12,6 @@ int main(void) printk("Hello world from %s\n", CONFIG_BOARD); printk("Hello world from %s\n", CONFIG_BOARD); printk("Hello world from %s\n", CONFIG_BOARD); - int a = 1; return 0; } From 372e552197d4aded9da99c20c6f2f344290944b7 Mon Sep 17 00:00:00 2001 From: Riccardo Date: Thu, 20 Apr 2023 10:50:40 +0200 Subject: [PATCH 60/66] Use conda for dependencies --- .github/workflows/build.yml | 69 ++++++++++++++++++++---------- .github/workflows/requirements.yml | 16 +++++++ 2 files changed, 62 insertions(+), 23 deletions(-) create mode 100644 .github/workflows/requirements.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d316b1e..32cdbd3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,38 +11,59 @@ jobs: CMAKE_PREFIX_PATH: /opt/toolchains steps: + + - name: Get current day + shell: bash -l {0} + run: echo "DATE=$(date +'%Y-%m-%d')" >> $GITHUB_ENV + - uses: actions/checkout@v3 with: path: myroot/mycode - - name: Installing required tools - run: | - # See https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/getting_started/installing.html#install-the-required-tools - wget https://apt.kitware.com/kitware-archive.sh - sudo bash kitware-archive.sh - # Install dependencies - sudo apt install --no-install-recommends git cmake ninja-build gperf \ - ccache dfu-util device-tree-compiler \ - python3-dev python3-pip python3-setuptools python3-tk python3-wheel xz-utils file \ - make gcc gcc-multilib g++-multilib libsdl2-dev libmagic1 - + # Use conda for main dependencies + - uses: conda-incubator/setup-miniconda@v2 + with: + miniforge-variant: Mambaforge + miniforge-version: latest + + # Print the environment variables to simplify development and debugging + - name: Environment Variables + # Use bash in order to have same basic commands in all OSs + shell: bash -l {0s} + run: env - - name: Install west + - name: Restore cached conda based dependencies + uses: actions/cache/restore@v3 + with: + path: ${{ env.CONDA }}/envs/test + key: conda-${{ hashFiles('.github/workflows/requirements.yml') }}-${{ env.DATE }} + id: cache-restore-conda-deps + + - name: Dependencies (using conda) + shell: bash -l {0} + if: steps.cache-restore-conda-deps.outputs.cache-hit != 'true' run: | - # See https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/getting_started/installing.html#install-west - pip3 install --user west - echo 'export PATH=~/.local/bin:"$PATH"' >> ~/.bashrc - source ~/.bashrc + mamba env update -f .github/workflows/conda-deps.yml + + - name: Cache conda based dependencies + if: ${{ steps.cache-restore-conda-deps.outputs.cache-hit != 'true' }} + uses: actions/cache/save@v3 + with: + path: ${{ env.CONDA }}/envs/test + key: conda-${{ hashFiles('.github/workflows/conda-deps.yml') }}-${{ env.DATE }} + id: cache-save-conda-deps - name: Restore cached west workspace - uses: actions/cache/restore@v3.3.1 + if: ${{ steps.cache-restore-conda-deps.outputs.cache-hit == 'true' }} + uses: actions/cache/restore@v3 with: path: myroot - key: ncs-zephyr-ci-workspace-${{hashFiles('myroot/mycode/west.yml')}} + key: ncs-zephyr-ci-workspace-${{hashFiles('myroot/mycode/west.yml')}}-${{ env.DATE }} id: cache-restore-ncs-zephyr-workspace - name: Get nRF Connect SDK code - if: ${{steps.artifacts-download-ncs-zephyr-workspace.outcome != 'success' }} + if: ${{ steps.cache-restore-ncs-zephyr-workspace.outputs.cache-hit != 'true' }} + shell: bash -l {0} run: | # See https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/getting_started/installing.html#get-the-ncs-code cd myroot @@ -53,16 +74,17 @@ jobs: - name: Save cached west workspace if: ${{ steps.cache-restore-ncs-zephyr-workspace.outputs.cache-hit != 'true' }} - uses: actions/cache/save@v3.3.1 + uses: actions/cache/save@v3 with: path: | myroot/* !myroot/mycode - key: ncs-zephyr-ci-workspace-${{hashFiles('myroot/mycode/west.yml')}} + key: ncs-zephyr-ci-workspace-${{hashFiles('myroot/mycode/west.yml')}}-${{ env.DATE }} id: cache-save-ncs-zephyr-workspace - name: Export zephyr CMake packages working-directory: myroot + shell: bash -l {0} run: west zephyr-export - name: Install additional Python dependencies @@ -73,8 +95,8 @@ jobs: pip3 install --user -r nrf/scripts/requirements.txt pip3 install --user -r bootloader/mcuboot/scripts/requirements.txt - - name: Install a toolchain - shell: bash + - name: Install athetoolchain + shell: bash -l {0} run: | # See https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/getting_started/installing.html#install-a-toolchain cd ~ @@ -88,6 +110,7 @@ jobs: - name: Build multicore working-directory: myroot + shell: bash -l {0} run: | # Setup command line build env source zephyr/zephyr-env.sh diff --git a/.github/workflows/requirements.yml b/.github/workflows/requirements.yml new file mode 100644 index 0000000..e64c217 --- /dev/null +++ b/.github/workflows/requirements.yml @@ -0,0 +1,16 @@ +#we use the default conda-incubator/setup-miniconda env name +name: test +dependencies: + - cmake + - gperf + - make + - ccache + - dfu-util + - device-tree-compiler + - xz + - file + - gcc + - g++ + - sdl2 + - libmagic + - west From d63b338bfd5027d32a32141518f200de04a214c6 Mon Sep 17 00:00:00 2001 From: Riccardo Date: Thu, 20 Apr 2023 10:57:18 +0200 Subject: [PATCH 61/66] Fix typo --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 32cdbd3..ae7acb2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,7 +29,7 @@ jobs: # Print the environment variables to simplify development and debugging - name: Environment Variables # Use bash in order to have same basic commands in all OSs - shell: bash -l {0s} + shell: bash -l {0} run: env - name: Restore cached conda based dependencies From 2b4d4e9d99d0715b99469b7adb37d6a4d69fd411 Mon Sep 17 00:00:00 2001 From: Riccardo Date: Thu, 20 Apr 2023 10:59:06 +0200 Subject: [PATCH 62/66] Fix conda requirements path --- .github/workflows/build.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ae7acb2..2b092e3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,21 +36,22 @@ jobs: uses: actions/cache/restore@v3 with: path: ${{ env.CONDA }}/envs/test - key: conda-${{ hashFiles('.github/workflows/requirements.yml') }}-${{ env.DATE }} + key: conda-${{ hashFiles('myroot/mycode/.github/workflows/requirements.yml') }}-${{ env.DATE }} id: cache-restore-conda-deps - name: Dependencies (using conda) shell: bash -l {0} + working-directory: myroot/mycode if: steps.cache-restore-conda-deps.outputs.cache-hit != 'true' run: | - mamba env update -f .github/workflows/conda-deps.yml + mamba env update -f .github/workflows/requirements.yml - name: Cache conda based dependencies if: ${{ steps.cache-restore-conda-deps.outputs.cache-hit != 'true' }} uses: actions/cache/save@v3 with: path: ${{ env.CONDA }}/envs/test - key: conda-${{ hashFiles('.github/workflows/conda-deps.yml') }}-${{ env.DATE }} + key: conda-${{ hashFiles('myroot/mycode/.github/workflows/requirements.yml') }}-${{ env.DATE }} id: cache-save-conda-deps - name: Restore cached west workspace From 37fc211fef9af4c095ddbcb27b73f02208bc57ad Mon Sep 17 00:00:00 2001 From: Riccardo Date: Thu, 20 Apr 2023 12:05:59 +0200 Subject: [PATCH 63/66] Add TimVideos channel for dfu-util --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2b092e3..683fe10 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,6 +25,8 @@ jobs: with: miniforge-variant: Mambaforge miniforge-version: latest + channels: conda-forge, robotology, TimVideos + channel-priority: true # Print the environment variables to simplify development and debugging - name: Environment Variables From a46b292734e131f6ac7c110bac659a1d7b2ef359 Mon Sep 17 00:00:00 2001 From: Riccardo Date: Thu, 20 Apr 2023 12:06:15 +0200 Subject: [PATCH 64/66] Fix package names --- .github/workflows/requirements.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/requirements.yml b/.github/workflows/requirements.yml index e64c217..46adac7 100644 --- a/.github/workflows/requirements.yml +++ b/.github/workflows/requirements.yml @@ -6,11 +6,11 @@ dependencies: - make - ccache - dfu-util - - device-tree-compiler + - dtc - xz - file - gcc - - g++ + - gxx - sdl2 - libmagic - west From de9d7f08a57f63c65f114ca02e1663aafba629db Mon Sep 17 00:00:00 2001 From: Riccardo Date: Thu, 20 Apr 2023 12:24:31 +0200 Subject: [PATCH 65/66] Add shell in step --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 683fe10..4b14253 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -92,6 +92,7 @@ jobs: - name: Install additional Python dependencies working-directory: myroot + shell: bash -l {0} run: | # See https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/getting_started/installing.html#install-additional-python-dependencies pip3 install --user -r zephyr/scripts/requirements.txt From 99f447c0301b77a94cab0955633761e565f2e7b3 Mon Sep 17 00:00:00 2001 From: Riccardo Date: Thu, 20 Apr 2023 12:41:55 +0200 Subject: [PATCH 66/66] Fix typo in step name --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4b14253..263a7e0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -99,7 +99,7 @@ jobs: pip3 install --user -r nrf/scripts/requirements.txt pip3 install --user -r bootloader/mcuboot/scripts/requirements.txt - - name: Install athetoolchain + - name: Install the toolchain shell: bash -l {0} run: | # See https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/getting_started/installing.html#install-a-toolchain