Skip to content

Commit cacf710

Browse files
committed
[nrf noup] ci: use action-ncs-toolchain-setup
There is now separate action to handle toolchain setup. Lets use that action here. Signed-off-by: Kari Hamalainen <kari.hamalainen@nordicsemi.no>
1 parent 0bc783d commit cacf710

2 files changed

Lines changed: 13 additions & 30 deletions

File tree

.github/workflows/build-using-docker.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ name: Build and test app in NCS docker container
33
on:
44
pull_request:
55
push:
6+
branches:
7+
- main
8+
- 'v*-branch'
69

710
jobs:
811
set-image-tag:

.github/workflows/build-using-toolchain-bundle.yml

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ name: Build and test app in toolchain bundle environment
33
on:
44
pull_request:
55
push:
6+
branches:
7+
- main
8+
- 'v*-branch'
69

710
jobs:
811
build-and-test-in-toolchain-bundle:
@@ -19,40 +22,17 @@ jobs:
1922
west init -l example-application
2023
west update -o=--depth=1 -n
2124
22-
- name: Install nrfutil and toolchain manager
23-
run: |
24-
wget -q https://files.nordicsemi.com/artifactory/swtools/external/nrfutil/executables/x86_64-unknown-linux-gnu/nrfutil
25-
chmod +x nrfutil
26-
./nrfutil install toolchain-manager
27-
28-
- name: Find proper toolchain bundle
29-
id: set-tb-id
30-
run: echo "TOOLCHAIN_BUNDLE_NAME=ncs-toolchain-x86_64-linux-$(./nrf/scripts/print_toolchain_checksum.sh).tar.gz" >> $GITHUB_OUTPUT
31-
32-
- name: Restore toolchain bundle from cache
33-
id: restore-cached-tb
34-
uses: actions/cache/restore@v4
25+
- name: Setup ncs toolchain
26+
id: setup-toolchain
27+
uses: nrfconnect/action-ncs-toolchain-setup@main
3528
with:
36-
path: ${{steps.set-tb-id.outputs.TOOLCHAIN_BUNDLE_NAME}}
37-
key: ${{steps.set-tb-id.outputs.TOOLCHAIN_BUNDLE_NAME}}
38-
39-
- name: Download toolchain bundle if not cached
40-
if: steps.restore-cached-tb.outputs.cache-hit != 'true'
41-
run: wget https://files.nordicsemi.com/artifactory/NCS/external/bundles/v3/${{steps.set-tb-id.outputs.TOOLCHAIN_BUNDLE_NAME}}
42-
43-
- name: Save toolchain bundle to cache
44-
if: steps.restore-cached-tb.outputs.cache-hit != 'true'
45-
uses: actions/cache/save@v4
46-
with:
47-
path: ${{steps.set-tb-id.outputs.TOOLCHAIN_BUNDLE_NAME}}
48-
key: ${{steps.set-tb-id.outputs.TOOLCHAIN_BUNDLE_NAME}}
49-
50-
- name: Install proper toolchain bundle
51-
run: ./nrfutil toolchain-manager install --toolchain-bundle ${{steps.set-tb-id.outputs.TOOLCHAIN_BUNDLE_NAME}}
29+
nrf-path: nrf
5230

5331
- name: Build firmware
5432
run: |
55-
./nrfutil toolchain-manager launch --chdir example-application -- west twister -T app -v --inline-logs --integration
33+
./nrfutil sdk-manager launch \
34+
--toolchain-bundle-id ${{steps.setup-toolchain.outputs.toolchain-bundle-id}} \
35+
--chdir example-application -- west twister -T app -v --inline-logs --integration
5636
5737
- name: Store hex files
5838
uses: actions/upload-artifact@v4

0 commit comments

Comments
 (0)