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

Commit

Permalink
feat: enable v2.9
Browse files Browse the repository at this point in the history
  • Loading branch information
coderbyheart committed Dec 20, 2024
1 parent 110c6c4 commit 933532e
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 34 deletions.
20 changes: 8 additions & 12 deletions .github/workflows/publish-docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@ jobs:
max-parallel: 1
matrix:
include:
- sdk_nrf_branch: v2.9-branch
toolchain_version: v2.9.0
native_board: native_sim

- sdk_nrf_branch: v2.8-branch
toolchain_version: v2.8.0
native_board: native_sim

- sdk_nrf_branch: v2.7-branch
toolchain_version: v2.7.0
native_board: native_sim
Expand All @@ -27,18 +35,6 @@ jobs:
toolchain_version: v2.5.0
native_board: native_sim

- sdk_nrf_branch: v2.4-branch
toolchain_version: v2.4.1
native_board: native_posix

- sdk_nrf_branch: v2.3-branch
toolchain_version: v2.3.0
native_board: native_posix

- sdk_nrf_branch: v2.2-branch
toolchain_version: v2.2.0
native_board: native_posix

runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand Down
20 changes: 8 additions & 12 deletions .github/workflows/verify.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@ jobs:
max-parallel: 1
matrix:
include:
- sdk_nrf_branch: v2.9-branch
toolchain_version: v2.9.0
native_board: native_sim

- sdk_nrf_branch: v2.8-branch
toolchain_version: v2.8.0
native_board: native_sim

- sdk_nrf_branch: v2.7-branch
toolchain_version: v2.7.0
native_board: native_sim
Expand All @@ -21,18 +29,6 @@ jobs:
toolchain_version: v2.5.0
native_board: native_sim

- sdk_nrf_branch: v2.4-branch
toolchain_version: v2.4.1
native_board: native_posix

- sdk_nrf_branch: v2.3-branch
toolchain_version: v2.3.0
native_board: native_posix

- sdk_nrf_branch: v2.2-branch
toolchain_version: v2.2.0
native_board: native_posix

runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM ubuntu:22.04 as base
WORKDIR /workdir

ARG sdk_nrf_branch=v2.7-branch
ARG toolchain_version=v2.7.0
ARG sdk_nrf_branch=v2.9-branch
ARG toolchain_version=v2.9.0
ARG sdk_nrf_commit
ARG NORDIC_COMMAND_LINE_TOOLS_VERSION="10-24-0/nrf-command-line-tools-10.24.0"
ARG arch=amd64
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Dockerfile example for building nRF Connect SDK applications on GitHub Actions

![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`, and the last 5 release branches 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) the last 5 release branches every night._)

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

Expand Down Expand Up @@ -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.7-branch .
docker build -t nrfconnect-sdk --build-arg sdk_nrf_version=v2.9-branch .
```

> [!NOTE]
Expand All @@ -61,13 +61,13 @@ docker build -t nrfconnect-sdk --build-arg sdk_nrf_version=v2.7-branch .
> [!NOTE]
> The prebuilt images are only available for `amd64` architecture (Linux).
To use the pre-built image [`nordicplayground/nrfconnect-sdk:main`](https://hub.docker.com/r/nordicplayground/nrfconnect-sdk); add `nordicplayground/` before the image name and `:tag` after. Replace `tag` with one of the [available tags](https://hub.docker.com/r/nordicplayground/nrfconnect-sdk/tags) on the Dockerhub image. The only difference between the tags are which Python dependencies are pre-installed in the image based on the different `requirements.txt` files from the nRF Connect SDK repository's west dependencies.
Pre-built images are available as [`nordicplayground/nrfconnect-sdk`](https://hub.docker.com/r/nordicplayground/nrfconnect-sdk).

```bash
docker run --rm -v ${PWD}:/workdir/project nordicplayground/nrfconnect-sdk:main ...
docker run --rm -v ${PWD}:/workdir/project nordicplayground/nrfconnect-sdk:v2.9-branch ...
```

The rest of the documentation will use the local name `nrfconnect-sdk`, but any of them can use `nordicplayground/nrfconnect-sdk:main` (or a different tag) instead.
The rest of the documentation will use the local name `nrfconnect-sdk`, but any of them can use `nordicplayground/nrfconnect-sdk:v2.9-branch` instead.

### Build the firmware

Expand Down Expand Up @@ -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.7-branch .
docker build -t nrfconnect-sdk --build-arg sdk_nrf_version=v2.9-branch .
cd ..
```

Expand All @@ -110,7 +110,7 @@ cd ..
This builds the `hci_uart` sample and stores the `hci_uart.hex` file in the current directory:

```bash
docker run --rm nordicplayground/nrfconnect-sdk:main \
docker run --rm nordicplayground/nrfconnect-sdk:v2.9-branch \
-v ${PWD}:/workdir/project \
west build zephyr/samples/bluetooth/hci_uart -p always -b nrf9160dk_nrf52840 --build-dir /workdir/project/build
ls -la build/b0/zephyr && cp build/b0/zephyr/zephyr.hex ./hci_uart.hex
Expand All @@ -120,7 +120,7 @@ ls -la build/b0/zephyr && cp build/b0/zephyr/zephyr.hex ./hci_uart.hex

```bash
# Init and build in Docker
docker run --rm nordicplayground/nrfconnect-sdk:main \
docker run --rm nordicplayground/nrfconnect-sdk:v2.9-branch \
-v ${PWD}:/workdir/project \
west build zephyr/samples/bluetooth/peripheral_ht -p always -b nrf52840dk_nrf52840 --build-dir /workdir/project/build

Expand Down

0 comments on commit 933532e

Please sign in to comment.