From 9a5b859f2517c5b99207f73614f19eb418d20533 Mon Sep 17 00:00:00 2001 From: Marian Buschsieweke Date: Wed, 4 Jun 2025 08:56:34 +0200 Subject: [PATCH 1/2] build-system: pin new docker image This ensures that `make BUILD_IN_DOCKER=1` will use the same container that was used in the CI (Murdock). (cherry picked from commit 28d294fcf8978d3a21af9ba2273d8f1f8df98f45) --- makefiles/docker.inc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefiles/docker.inc.mk b/makefiles/docker.inc.mk index f69b9653fa36..af7f42b76deb 100644 --- a/makefiles/docker.inc.mk +++ b/makefiles/docker.inc.mk @@ -5,7 +5,7 @@ # When the docker image is updated, checks at # dist/tools/buildsystem_sanity_check/check.sh start complaining in CI, and # provide the latest values to verify and fill in. -DOCKER_TESTED_IMAGE_REPO_DIGEST := 63a87608742890b1ecfc2eea5289d32298d6696a4bd1d9d11a9da2fd32071e4f +DOCKER_TESTED_IMAGE_REPO_DIGEST := 116c51ffe0c80ffcf9eb693334f8f2e180cdaa66509e81a21217fdd45a2858b5 DOCKER_PULL_IDENTIFIER := docker.io/riot/riotbuild@sha256:$(DOCKER_TESTED_IMAGE_REPO_DIGEST) export DOCKER_IMAGE ?= $(DOCKER_PULL_IDENTIFIER) From bfcacb3e1d99a936a1de6f01e86b8bf9f9d204df Mon Sep 17 00:00:00 2001 From: Marian Buschsieweke Date: Wed, 4 Jun 2025 15:20:49 +0200 Subject: [PATCH 2/2] examples/.../rust-gcoap: disable build on native for now Until the bug is fixed (cherry picked from commit 0a21b4d990a1a1d9503f3231257355e6c99cc950) --- examples/lang_support/official/rust-gcoap/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/examples/lang_support/official/rust-gcoap/Makefile b/examples/lang_support/official/rust-gcoap/Makefile index bf77bc2f7c71..5b6863c966a6 100644 --- a/examples/lang_support/official/rust-gcoap/Makefile +++ b/examples/lang_support/official/rust-gcoap/Makefile @@ -1,6 +1,9 @@ # name of your application APPLICATION = rust_gcoap +# TODO: Fix bug in docker image +BOARD_BLACKLIST := native32 native64 native + # The name of crate (as per Cargo.toml package name, but with '-' replaced with '_') # # The presence of this triggers building Rust code contained in this