Skip to content
This repository has been archived by the owner on Dec 20, 2024. It is now read-only.

feat: build for SDK release 2.5.0 #86

Merged
merged 2 commits into from
Oct 27, 2023
Merged

feat: build for SDK release 2.5.0 #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ff30e0
feat: build for SDK release 2.5.0
coderbyheart Oct 27, 2023
a633030
fix: use versioned toolchain
coderbyheart Oct 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/publish-docker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,17 @@ jobs:
matrix:
sdk_nrf_branch:
- main
- v2.5-branch
- v2.4-branch
- v2.3-branch
- v2.2-branch
- v2.1-branch
- v2.0-branch
include:
- sdk_nrf_branch: main
toolchain_version: v2.4.1
toolchain_version: v2.5.0
- sdk_nrf_branch: v2.5-branch
toolchain_version: v2.5.0
- sdk_nrf_branch: v2.4-branch
toolchain_version: v2.4.1
- sdk_nrf_branch: v2.3-branch
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/verify.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,17 @@ jobs:
matrix:
sdk_nrf_branch:
- main
- v2.5-branch
- v2.4-branch
- v2.3-branch
- v2.2-branch
- v2.1-branch
- v2.0-branch
include:
- sdk_nrf_branch: main
toolchain_version: v2.4.1
toolchain_version: v2.5.0
- sdk_nrf_branch: v2.5-branch
toolchain_version: v2.5.0
- sdk_nrf_branch: v2.4-branch
toolchain_version: v2.4.1
- sdk_nrf_branch: v2.3-branch
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM ubuntu:22.04 as base
WORKDIR /workdir

ARG sdk_nrf_branch=v2.4-branch
ARG toolchain_version=v2.4.1
ARG sdk_nrf_branch=v2.5-branch
ARG toolchain_version=v2.5.0
ARG sdk_nrf_commit
ARG NORDIC_COMMAND_LINE_TOOLS_VERSION="10-23-0/nrf-command-line-tools-10.23.0"
ARG NORDIC_COMMAND_LINE_TOOLS_VERSION="10-23-2/nrf-command-line-tools-10.23.2"
ARG arch=amd64

ENV DEBIAN_FRONTEND=noninteractive
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Dockerfile example for building nRF Connect SDK applications

![Publish Docker](https://github.com/NordicPlayground/nrf-docker/workflows/Publish%20Docker/badge.svg?branch=saga)
(_the [Docker image](https://hub.docker.com/r/nordicplayground/nrfconnect-sdk) is build against [nRF Connect SDK](https://github.com/nrfconnect/sdk-nrf) `main`,`v2.4-branch`,`v2.3-branch`,`v2.2-branch`,`v2.1-branch`, and `v2.0-branch` every night._)
(_the [Docker image](https://hub.docker.com/r/nordicplayground/nrfconnect-sdk) is build against [nRF Connect SDK](https://github.com/nrfconnect/sdk-nrf) `main`,`v2.5-branch`,`v2.4-branch`,`v2.3-branch`,`v2.2-branch`,`v2.1-branch`, and `v2.0-branch` every night._)

![Docker + Zephyr -> merged.hex](./diagram.png)

Expand Down Expand Up @@ -35,7 +35,7 @@ Build the image (this is only needed once):

```bash
cd nrf-docker
docker build -t nrfconnect-sdk --build-arg sdk_nrf_version=v2.4-branch .
docker build -t nrfconnect-sdk --build-arg sdk_nrf_version=v2.5-branch .
```

> [!NOTE]
Expand Down Expand Up @@ -99,7 +99,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.4-branch .
docker build -t nrfconnect-sdk --build-arg sdk_nrf_version=v2.5-branch .
cd ..
```

Expand Down
Loading