Skip to content

ci: Move docker_push_image into a separate workflow #14872

Merged
xokdvium merged 3 commits intoNixOS:masterfrom
xokdvium:docker-push-image-separate-workflow
Dec 28, 2025
Merged

ci: Move docker_push_image into a separate workflow #14872
xokdvium merged 3 commits intoNixOS:masterfrom
xokdvium:docker-push-image-separate-workflow

Conversation

@xokdvium
Copy link
Contributor

Motivation

This should allow reusing this workflow (with more tweaks)
in the releng workflow. Best reviewed with -w --color-moved.
Currently this workflow is only run for master branch, but in the future
we'll adapt it for maintenance- branches too.

Context


Add 👍 to pull requests you find important.

The Nix maintainer team uses a GitHub project board to schedule and track reviews.

Best reviewed with -w --color-moved. This just moves the code
into a separate workflow. This will allow us to reuse it in
the release job for github releng of releases.
This should allow reusing this workflow (with more tweaks)
in the releng workflow.
@xokdvium xokdvium requested a review from Mic92 December 28, 2025 00:41
@xokdvium xokdvium requested a review from edolstra as a code owner December 28, 2025 00:41
@xokdvium xokdvium added backport 2.31-maintenance Automatically creates a PR against the branch backport 2.32-maintenance Automatically creates a PR against the branch backport 2.33-maintenance Automatically creates a PR against the branch labels Dec 28, 2025
@xokdvium
Copy link
Contributor Author

Tested in my own fork/repos. Seems to do the right thing. (Looking at this setup, I'm quite skeptical of why we push master as latest to GHCR, hopefully we'll get this fixed once we automate release uploads and we can easily add GHCR to the release scope).

@xokdvium xokdvium added this pull request to the merge queue Dec 28, 2025
Merged via the queue into NixOS:master with commit 5aa2af1 Dec 28, 2025
18 checks passed
@xokdvium xokdvium deleted the docker-push-image-separate-workflow branch December 28, 2025 13:33
@internal-nix-ci
Copy link

Backport failed for 2.31-maintenance, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin 2.31-maintenance
git worktree add -d .worktree/backport-14872-to-2.31-maintenance origin/2.31-maintenance
cd .worktree/backport-14872-to-2.31-maintenance
git switch --create backport-14872-to-2.31-maintenance
git cherry-pick -x 745983dfc057c6b645cad93190be9fab0058208e fb05f6de0d508225d0724c3e87052b5606a623d2 c867ed6726ffd0cf739b14d08917b86fd3492ff2

@internal-nix-ci
Copy link

Backport failed for 2.32-maintenance, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin 2.32-maintenance
git worktree add -d .worktree/backport-14872-to-2.32-maintenance origin/2.32-maintenance
cd .worktree/backport-14872-to-2.32-maintenance
git switch --create backport-14872-to-2.32-maintenance
git cherry-pick -x 745983dfc057c6b645cad93190be9fab0058208e fb05f6de0d508225d0724c3e87052b5606a623d2 c867ed6726ffd0cf739b14d08917b86fd3492ff2

@internal-nix-ci
Copy link

Git push to origin failed for 2.33-maintenance with exitcode 1

@xokdvium xokdvium added backport 2.33-maintenance Automatically creates a PR against the branch and removed backport 2.31-maintenance Automatically creates a PR against the branch backport 2.32-maintenance Automatically creates a PR against the branch backport 2.33-maintenance Automatically creates a PR against the branch labels Dec 28, 2025
@internal-nix-ci
Copy link

Successfully created backport PR for 2.33-maintenance:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 2.33-maintenance Automatically creates a PR against the branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants