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

Commit

Permalink
feat: add v2.6, remove v2.1 and v2.0
Browse files Browse the repository at this point in the history
Only build the last 5 release branches
  • Loading branch information
coderbyheart committed Mar 14, 2024
1 parent 81872fa commit 4b5286e
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 23 deletions.
14 changes: 5 additions & 9 deletions .github/workflows/publish-docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@ jobs:
matrix:
include:
- sdk_nrf_branch: main
toolchain_version: v2.5.0
toolchain_version: v2.6.0
native_board: native_sim

- sdk_nrf_branch: v2.6-branch
toolchain_version: v2.6.0
native_board: native_sim

- sdk_nrf_branch: v2.5-branch
Expand All @@ -35,14 +39,6 @@ jobs:
toolchain_version: v2.2.0
native_board: native_posix

- sdk_nrf_branch: v2.1-branch
toolchain_version: v2.1.3
native_board: native_posix

- sdk_nrf_branch: v2.0-branch
toolchain_version: v2.0.2
native_board: native_posix

runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand Down
14 changes: 5 additions & 9 deletions .github/workflows/verify.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ jobs:
matrix:
include:
- sdk_nrf_branch: main
toolchain_version: v2.5.0
toolchain_version: v2.6.0
native_board: native_sim

- sdk_nrf_branch: v2.6-branch
toolchain_version: v2.6.0
native_board: native_sim

- sdk_nrf_branch: v2.5-branch
Expand All @@ -29,14 +33,6 @@ jobs:
toolchain_version: v2.2.0
native_board: native_posix

- sdk_nrf_branch: v2.1-branch
toolchain_version: v2.1.3
native_board: native_posix

- sdk_nrf_branch: v2.0-branch
toolchain_version: v2.0.2
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.5-branch
ARG toolchain_version=v2.5.0
ARG sdk_nrf_branch=v2.6-branch
ARG toolchain_version=v2.6.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
6 changes: 3 additions & 3 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

![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.5-branch`,`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`, and the last 5 release branches 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.5-branch .
docker build -t nrfconnect-sdk --build-arg sdk_nrf_version=v2.6-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.5-branch .
docker build -t nrfconnect-sdk --build-arg sdk_nrf_version=v2.6-branch .
cd ..
```

Expand Down

0 comments on commit 4b5286e

Please sign in to comment.