Skip to content

makefiles: bump riotdocker [backport 2025.01] #21329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Mar 27, 2025
Merged

makefiles: bump riotdocker [backport 2025.01] #21329

merged 1 commit into from
Mar 27, 2025

Conversation

maribu
Copy link
Member

@maribu maribu commented Mar 27, 2025

Backport of #21258

Contribution description

After RIOT-OS/riotdocker#257 as requested by CI in https://github.com/RIOT-OS/RIOT/actions/runs/13591031011

Testing procedure

static tests should succeed

@mguetschow @maribu
makefiles: bump riotdocker
fa51d0d 
(cherry picked from commit 1c97587)
@maribu maribu added Area: build system Area: Build system CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR CI: skip compile test If set, CI server will run only non-compile jobs, but no compile jobs or their dependent jobs Process: release backport Integration Process: The PR is a release backport of a change previously provided to master labels Mar 27, 2025
@maribu maribu requested a review from benpicco March 27, 2025 09:10
@maribu maribu mentioned this pull request Mar 27, 2025
Merged
@maribu maribu added CI: full build disable CI build filter CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR and removed CI: skip compile test If set, CI server will run only non-compile jobs, but no compile jobs or their dependent jobs CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR labels Mar 27, 2025
@maribu
Copy link
Member Author

maribu commented Mar 27, 2025

This:

a) verifies that the release branch still builds with the new CI image, so that we can backport stuff
b) fixes the static-test that checks that the CI is using the same image as pinned in makefiles/docker.inc.mk

@maribu maribu mentioned this pull request Mar 27, 2025
Merged
@riot-ci
Copy link

riot-ci commented Mar 27, 2025

Murdock results

✔️ PASSED

fa51d0d makefiles: bump riotdocker

Success Failures Total Runtime
148481 0 148484 01h:41m:01s

Artifacts

@maribu maribu enabled auto-merge March 27, 2025 12:58
@maribu maribu added this pull request to the merge queue Mar 27, 2025
@mguetschow
Copy link
Contributor

Would be nicer to pin riotdocker versions for each release, I'd say. But at least this fixes the issue for now.

@maribu
Copy link
Member Author

maribu commented Mar 27, 2025

The problem is that even backports run with the most recent version of riotbuild, no matter what. This PR just bumps the pinning of what to use for BUILD_IN_DOCKER=1 to match what is used in the CI. Otherwise users of the release branch may run into compilation issues that only happens with an older version of riotbuild.

I agree that it would be a lot better if we could pin the docker container the CI uses in a release branch. But until than, backporting the bump of the docker image is what brings CI and BUILD_IN_DOCKER=1 back in sync.

Merged via the queue into RIOT-OS:2025.01-branch with commit 86a59ac Mar 27, 2025
34 checks passed
@maribu maribu deleted the backport/2025.01/riotdocker-bump branch March 27, 2025 16:05
@mguetschow mguetschow added this to the Release 2025.01 milestone Apr 8, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Teufelchen1 Teufelchen1 Teufelchen1 approved these changes

@benpicco benpicco Awaiting requested review from benpicco

Assignees
No one assigned
Labels
Area: build system Area: Build system CI: full build disable CI build filter CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Process: release backport Integration Process: The PR is a release backport of a change previously provided to master
Projects
None yet
Milestone
Release 2025.01
Development

Successfully merging this pull request may close these issues.
4 participants
@maribu @riot-ci @mguetschow @Teufelchen1