From 5e9a4d407e88ada648452f0a856d968e5d26f0eb Mon Sep 17 00:00:00 2001 From: Sergey <61871201+SergeyLadanov@users.noreply.github.com> Date: Tue, 19 Sep 2023 01:02:39 +0300 Subject: [PATCH 01/11] Update README.md --- README.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/README.md b/README.md index b65bcfc..72811d2 100644 --- a/README.md +++ b/README.md @@ -20,3 +20,18 @@ jobs: build_dir: build ``` + +## How to specify a version of NRF Connect SDK + +To select the specific version of NRF Connect SDK you +can reference a specific version of GitHub action: +``` +uses: embedd-actions/nrf-connect-sdk-prebuild-ci@v2.3.0 +uses: embedd-actions/nrf-connect-sdk-prebuild-ci@v2.4.0 +``` + +## List of available tags + +``` +v2.3.0 +``` From 155fcb4bc2ade6da4f726d8d48d45cc2a476b623 Mon Sep 17 00:00:00 2001 From: Sergey <61871201+SergeyLadanov@users.noreply.github.com> Date: Tue, 19 Sep 2023 01:04:59 +0300 Subject: [PATCH 02/11] Update and rename Dockerfile to Image.Dockerfile --- Dockerfile => Image.Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename Dockerfile => Image.Dockerfile (96%) diff --git a/Dockerfile b/Image.Dockerfile similarity index 96% rename from Dockerfile rename to Image.Dockerfile index 6e7e08e..b4bdfcb 100644 --- a/Dockerfile +++ b/Image.Dockerfile @@ -1,11 +1,11 @@ FROM debian:stable-slim #ARG ARCH=amd64 -ARG NRF_CONNECT_TAG=v2.4.2 +ARG NRF_CONNECT_TAG=v2.3.0 # Should be for selected NRF_CONNECT_TAG -ARG ZEPHYR_NEEDED_TAG=0.16.0 +ARG ZEPHYR_NEEDED_TAG=0.15.2 # For new versions - xz -ARG ZEPHYR_ARCHIVE_EXTENSION=xz +ARG ZEPHYR_ARCHIVE_EXTENSION=gz # For entrypoint file ENV ZEPHYR_TAG=$ZEPHYR_NEEDED_TAG From c93287ed9db24da0c6b8e5c4d29bc84c7726810d Mon Sep 17 00:00:00 2001 From: Sergey <61871201+SergeyLadanov@users.noreply.github.com> Date: Tue, 19 Sep 2023 01:06:02 +0300 Subject: [PATCH 03/11] Create Action.Dockerfile --- Action.Dockerfile | 1 + 1 file changed, 1 insertion(+) create mode 100644 Action.Dockerfile diff --git a/Action.Dockerfile b/Action.Dockerfile new file mode 100644 index 0000000..8a282a4 --- /dev/null +++ b/Action.Dockerfile @@ -0,0 +1 @@ +FROM sergeyladanov/nrf-connect-sdk:v2.3.0 From 9a574bce2c994420a151d1ab3f9b3f2b47a75e27 Mon Sep 17 00:00:00 2001 From: Sergey <61871201+SergeyLadanov@users.noreply.github.com> Date: Tue, 19 Sep 2023 01:06:20 +0300 Subject: [PATCH 04/11] Update action.yml --- action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/action.yml b/action.yml index e0e111f..17bcdcf 100644 --- a/action.yml +++ b/action.yml @@ -10,7 +10,7 @@ inputs: default: 'build' runs: using: 'docker' - image: 'Dockerfile' + image: 'Action.Dockerfile' args: - west - build From 43385f7ce45a989a7ac69623f8db93d0d6c9460d Mon Sep 17 00:00:00 2001 From: Sergey <61871201+SergeyLadanov@users.noreply.github.com> Date: Tue, 19 Sep 2023 01:08:52 +0300 Subject: [PATCH 05/11] Update docker-compose.yml --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 7e79ce0..a01f85b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,7 @@ services: container_name: nrf build: context: . - dockerfile: Dockerfile + dockerfile: Image.Dockerfile args: - NRF_CONNECT_TAG=v2.3.0 - ZEPHYR_NEEDED_TAG=0.15.2 From b6835f7487e20c7a9575153f1c4870fce0bdf44b Mon Sep 17 00:00:00 2001 From: Sergey <61871201+SergeyLadanov@users.noreply.github.com> Date: Tue, 19 Sep 2023 01:09:28 +0300 Subject: [PATCH 06/11] Update image_publishing.yml --- .github/workflows/image_publishing.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/image_publishing.yml b/.github/workflows/image_publishing.yml index d9f5c59..01bd53d 100644 --- a/.github/workflows/image_publishing.yml +++ b/.github/workflows/image_publishing.yml @@ -36,6 +36,7 @@ jobs: uses: docker/build-push-action@v5 with: context: . + file: Image.Dockerfile push: true tags: ${{ steps.meta.outputs.tags }} platforms: linux/amd64,linux/arm64 From 6e09aec7fc1a07558a1c512d1ccb01354b41d9cf Mon Sep 17 00:00:00 2001 From: Sergey <61871201+SergeyLadanov@users.noreply.github.com> Date: Tue, 19 Sep 2023 01:12:57 +0300 Subject: [PATCH 07/11] Update image_publishing.yml --- .github/workflows/image_publishing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/image_publishing.yml b/.github/workflows/image_publishing.yml index 01bd53d..800b5cb 100644 --- a/.github/workflows/image_publishing.yml +++ b/.github/workflows/image_publishing.yml @@ -3,7 +3,7 @@ name: Publish image on: push: tags: - - '*' + - 'v*.*.*' jobs: build: From e834ea2845ba72e8ab904528eea9fac70d6170bc Mon Sep 17 00:00:00 2001 From: Sergey <61871201+SergeyLadanov@users.noreply.github.com> Date: Tue, 19 Sep 2023 01:18:46 +0300 Subject: [PATCH 08/11] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 72811d2..2643422 100644 --- a/README.md +++ b/README.md @@ -34,4 +34,5 @@ uses: embedd-actions/nrf-connect-sdk-prebuild-ci@v2.4.0 ``` v2.3.0 +v2.4.0 ``` From 0232bfca0eacc0fe2bc71abe2493fb84375ddd82 Mon Sep 17 00:00:00 2001 From: Sergey <61871201+SergeyLadanov@users.noreply.github.com> Date: Tue, 19 Sep 2023 01:19:08 +0300 Subject: [PATCH 09/11] Update Action.Dockerfile --- Action.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Action.Dockerfile b/Action.Dockerfile index 8a282a4..fa45b5d 100644 --- a/Action.Dockerfile +++ b/Action.Dockerfile @@ -1 +1 @@ -FROM sergeyladanov/nrf-connect-sdk:v2.3.0 +FROM sergeyladanov/nrf-connect-sdk:v2.4.0 From e76eeae03bd2e6500ade9c51585c30d85a478e36 Mon Sep 17 00:00:00 2001 From: Sergey <61871201+SergeyLadanov@users.noreply.github.com> Date: Tue, 19 Sep 2023 01:21:00 +0300 Subject: [PATCH 10/11] Update Image.Dockerfile --- Image.Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Image.Dockerfile b/Image.Dockerfile index b4bdfcb..0465444 100644 --- a/Image.Dockerfile +++ b/Image.Dockerfile @@ -1,11 +1,11 @@ FROM debian:stable-slim #ARG ARCH=amd64 -ARG NRF_CONNECT_TAG=v2.3.0 +ARG NRF_CONNECT_TAG=v2.4.0 # Should be for selected NRF_CONNECT_TAG -ARG ZEPHYR_NEEDED_TAG=0.15.2 +ARG ZEPHYR_NEEDED_TAG=0.16.0 # For new versions - xz -ARG ZEPHYR_ARCHIVE_EXTENSION=gz +ARG ZEPHYR_ARCHIVE_EXTENSION=xz # For entrypoint file ENV ZEPHYR_TAG=$ZEPHYR_NEEDED_TAG From 1fbf81856e2f9a13fdee9bc5288c23eae4abc7c6 Mon Sep 17 00:00:00 2001 From: Sergey <61871201+SergeyLadanov@users.noreply.github.com> Date: Tue, 19 Sep 2023 01:41:51 +0300 Subject: [PATCH 11/11] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2643422..745c4e2 100644 --- a/README.md +++ b/README.md @@ -26,8 +26,8 @@ jobs: To select the specific version of NRF Connect SDK you can reference a specific version of GitHub action: ``` -uses: embedd-actions/nrf-connect-sdk-prebuild-ci@v2.3.0 -uses: embedd-actions/nrf-connect-sdk-prebuild-ci@v2.4.0 +uses: embedd-actions/nrf-connect-sdk-ci@v2.3.0 +uses: embedd-actions/nrf-connect-sdk-ci@v2.4.0 ``` ## List of available tags