From 4bb76dad1d8df1ea237cb50f93d932c6c8d2104c Mon Sep 17 00:00:00 2001 From: Markus Tacker Date: Mon, 15 Jul 2024 23:57:30 +0200 Subject: [PATCH] feat: add v2.7 See https://github.com/nrfconnect/sdk-nrf/releases/tag/v2.7.0 Closes #103 --- .github/workflows/publish-docker.yaml | 6 +++++- .github/workflows/verify.yaml | 6 +++++- Dockerfile | 4 ++-- README.md | 4 ++-- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml index 1434b45..2ad7554 100644 --- a/.github/workflows/publish-docker.yaml +++ b/.github/workflows/publish-docker.yaml @@ -16,7 +16,11 @@ jobs: matrix: include: - sdk_nrf_branch: main - toolchain_version: v2.6.0 + toolchain_version: v2.7.0 + native_board: native_sim + + - sdk_nrf_branch: v2.7-branch + toolchain_version: v2.7.0 native_board: native_sim - sdk_nrf_branch: v2.6-branch diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml index 0931b78..d6ac546 100644 --- a/.github/workflows/verify.yaml +++ b/.github/workflows/verify.yaml @@ -10,7 +10,11 @@ jobs: matrix: include: - sdk_nrf_branch: main - toolchain_version: v2.6.0 + toolchain_version: v2.7.0 + native_board: native_sim + + - sdk_nrf_branch: v2.7-branch + toolchain_version: v2.7.0 native_board: native_sim - sdk_nrf_branch: v2.6-branch diff --git a/Dockerfile b/Dockerfile index 4464597..964413e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ FROM ubuntu:22.04 as base WORKDIR /workdir -ARG sdk_nrf_branch=v2.6-branch -ARG toolchain_version=v2.6.0 +ARG sdk_nrf_branch=v2.7-branch +ARG toolchain_version=v2.7.0 ARG sdk_nrf_commit ARG NORDIC_COMMAND_LINE_TOOLS_VERSION="10-24-0/nrf-command-line-tools-10.24.0" ARG arch=amd64 diff --git a/README.md b/README.md index 5667665..5a32e42 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ Build the image (this is only needed once): ```bash cd nrf-docker -docker build -t nrfconnect-sdk --build-arg sdk_nrf_version=v2.6-branch . +docker build -t nrfconnect-sdk --build-arg sdk_nrf_version=v2.7-branch . ``` > [!NOTE] @@ -101,7 +101,7 @@ docker run --rm -v ${PWD}:/workdir/project \ # build docker image git clone https://github.com/NordicPlayground/nrf-docker cd nrf-docker -docker build -t nrfconnect-sdk --build-arg sdk_nrf_version=v2.6-branch . +docker build -t nrfconnect-sdk --build-arg sdk_nrf_version=v2.7-branch . cd .. ```