Skip to content

build-system: pin new docker image [backport 2025.04]#21541

Merged
maribu merged 2 commits intoRIOT-OS:2025.04-branchfrom
maribu:backport/2025.04/makefiles/docker.inc.mk/pin-new-image
Jun 5, 2025
Merged

build-system: pin new docker image [backport 2025.04]#21541
maribu merged 2 commits intoRIOT-OS:2025.04-branchfrom
maribu:backport/2025.04/makefiles/docker.inc.mk/pin-new-image

Conversation

@maribu
Copy link
Member

@maribu maribu commented Jun 5, 2025

Backport of #21531

Contribution description

This ensures that make BUILD_IN_DOCKER=1 will use the same container that was used in the CI (Murdock).

Testing procedure

Green CI

Issues/PRs references

None

maribu added 2 commits June 5, 2025 10:34
@maribu
build-system: pin new docker image
9a5b859 
This ensures that `make BUILD_IN_DOCKER=1` will use the same container
that was used in the CI (Murdock).

(cherry picked from commit 28d294f)
@maribu
examples/.../rust-gcoap: disable build on native for now
bfcacb3 
Until the bug is fixed

(cherry picked from commit 0a21b4d)
@maribu maribu added Area: build system Area: Build system Area: examples Area: Example Applications CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Impact: minor The PR is small in size and might only require a quick look of a knowledgeable reviewer Process: release backport Integration Process: The PR is a release backport of a change previously provided to master Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors) Type: enhancement The issue suggests enhanceable parts / The PR enhances parts of the codebase / documentation labels Jun 5, 2025
@maribu maribu requested a review from mguetschow June 5, 2025 08:34
@maribu maribu mentioned this pull request Jun 5, 2025
Merged
@maribu maribu enabled auto-merge June 5, 2025 08:34
@maribu maribu mentioned this pull request Jun 5, 2025
Merged
@maribu maribu added this pull request to the merge queue Jun 5, 2025
mguetschow
mguetschow reviewed Jun 5, 2025
View reviewed changes
examples/lang_support/official/rust-gcoap/Makefile
APPLICATION = rust_gcoap

# TODO: Fix bug in docker image
BOARD_BLACKLIST := native32 native64 native
Copy link
Contributor

@mguetschow mguetschow Jun 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will make it difficult to test rust-gcoap in the riotdocker repo :P

Copy link
Member Author

@maribu maribu Jun 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, indeed :/

Copy link
Member Author

@maribu maribu Jun 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One easy way would be to temporarily add the following to the testing script:

make BOARD=native64 CONTINUE_ON_EXPECTED_ERRORS=1 -C RIOT/examples/lang_support/official/rust-gcoap

Merged via the queue into RIOT-OS:2025.04-branch with commit 4b68366 Jun 5, 2025
32 of 33 checks passed
@maribu maribu deleted the backport/2025.04/makefiles/docker.inc.mk/pin-new-image branch June 5, 2025 08:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@crasbe crasbe crasbe approved these changes

@mguetschow mguetschow mguetschow approved these changes

Assignees

No one assigned

Labels

Area: build system Area: Build system Area: examples Area: Example Applications CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Impact: minor The PR is small in size and might only require a quick look of a knowledgeable reviewer Process: release backport Integration Process: The PR is a release backport of a change previously provided to master Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors) Type: enhancement The issue suggests enhanceable parts / The PR enhances parts of the codebase / documentation

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@maribu @crasbe @mguetschow