From 4ee15362302fd7e6c40579dff34422ea5e077722 Mon Sep 17 00:00:00 2001 From: Markus Tacker Date: Mon, 21 Oct 2024 09:31:01 +0200 Subject: [PATCH] fix: disable v2.7 until upstream fix is merged\ See https://github.com/NordicPlayground/nrf-docker/pull/92\#issuecomment-2425325324 --- .github/workflows/publish-docker.yaml | 8 -------- .github/workflows/verify.yaml | 8 -------- Dockerfile | 4 ++-- 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml index 2ad7554..875bc84 100644 --- a/.github/workflows/publish-docker.yaml +++ b/.github/workflows/publish-docker.yaml @@ -15,14 +15,6 @@ jobs: max-parallel: 1 matrix: include: - - sdk_nrf_branch: main - 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 toolchain_version: v2.6.0 native_board: native_sim diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml index d6ac546..cbc9dbd 100644 --- a/.github/workflows/verify.yaml +++ b/.github/workflows/verify.yaml @@ -9,14 +9,6 @@ jobs: max-parallel: 1 matrix: include: - - sdk_nrf_branch: main - 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 toolchain_version: v2.6.0 native_board: native_sim diff --git a/Dockerfile b/Dockerfile index 964413e..4464597 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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.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