From 76beb192bcb8c60db9e6a3d4d5dfeab39e80655c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Fri, 31 Oct 2025 15:49:17 +0100 Subject: [PATCH 1/2] gha/release: Improve workflow input descriptions and ordering MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Paweł Gronowski --- .github/workflows/release-buildx.yml | 16 ++++++++-------- .github/workflows/release-cagent.yml | 14 +++++++------- .github/workflows/release-compose.yml | 14 +++++++------- .github/workflows/release-containerd.yml | 14 +++++++------- .github/workflows/release-credential-helpers.yml | 14 +++++++------- .github/workflows/release-docker-cli.yml | 14 +++++++------- .github/workflows/release-docker-engine.yml | 14 +++++++------- .github/workflows/release-model.yml | 14 +++++++------- 8 files changed, 57 insertions(+), 57 deletions(-) diff --git a/.github/workflows/release-buildx.yml b/.github/workflows/release-buildx.yml index 85b337d7..4a2caec0 100644 --- a/.github/workflows/release-buildx.yml +++ b/.github/workflows/release-buildx.yml @@ -8,15 +8,11 @@ on: workflow_dispatch: inputs: ref: - description: 'Ref (e.g. v0.10.0)' + description: 'Tag/ref to build (e.g. v0.10.0)' required: true type: string - repo: - description: 'Override default repo' - required: false - type: string release: - description: 'Release type' + description: '(optional) Release type' required: false default: 'pushonly' type: choice @@ -26,17 +22,21 @@ on: - prerelease - release distros: - description: 'Distros to build (comma-separated, e.g. "debian12,ubuntu2204")' + description: '(optional, empty = all supported) Distros to build (comma-separated, e.g. "debian12,ubuntu2204")' required: false type: string default: '' revision: description: | - Revision of the package to build. Only in case we ever would have to re-build an already published release with a packaging-only change. + (optional) Revision of the package to build. Only in case we ever would have to re-build an already published release with a packaging-only change. Default for a tagged/upstream release is 1. required: false type: string default: '' + repo: + description: '(optional) Override default repo (if want to build from a different Github repo/fork)' + required: false + type: string jobs: release: diff --git a/.github/workflows/release-cagent.yml b/.github/workflows/release-cagent.yml index fa4a0f09..0108f3e5 100644 --- a/.github/workflows/release-cagent.yml +++ b/.github/workflows/release-cagent.yml @@ -8,15 +8,11 @@ on: workflow_dispatch: inputs: ref: - description: 'Ref (e.g. v0.1.30)' + description: 'Tag/ref to build (e.g. v0.1.30)' required: true type: string - repo: - description: 'Override default repo' - required: false - type: string release: - description: 'Release type' + description: '(optional) Release type' required: false default: 'pushonly' type: choice @@ -26,7 +22,7 @@ on: - prerelease - release distros: - description: 'Distros to build (comma-separated, e.g. "debian12,ubuntu22.04")' + description: '(optional, empty = all supported) Distros to build (comma-separated, e.g. "debian12,ubuntu2204")' required: false type: string default: '' @@ -37,6 +33,10 @@ on: required: false type: string default: '' + repo: + description: '(optional) Override default repo (if want to build from a different Github repo/fork)' + required: false + type: string jobs: release: diff --git a/.github/workflows/release-compose.yml b/.github/workflows/release-compose.yml index d11fc869..cb166858 100644 --- a/.github/workflows/release-compose.yml +++ b/.github/workflows/release-compose.yml @@ -8,15 +8,11 @@ on: workflow_dispatch: inputs: ref: - description: 'Ref (e.g. v2.15.1)' + description: 'Tag/ref to build (e.g. v2.15.1)' required: true type: string - repo: - description: 'Override default repo' - required: false - type: string release: - description: 'Release type' + description: '(optional) Release type' required: false default: 'pushonly' type: choice @@ -26,7 +22,7 @@ on: - prerelease - release distros: - description: 'Distros to build (comma-separated, e.g. "debian12,ubuntu22.04")' + description: '(optional, empty = all supported) Distros to build (comma-separated, e.g. "debian12,ubuntu2204")' required: false type: string default: '' @@ -37,6 +33,10 @@ on: required: false type: string default: '' + repo: + description: '(optional) Override default repo (if want to build from a different Github repo/fork)' + required: false + type: string jobs: release: diff --git a/.github/workflows/release-containerd.yml b/.github/workflows/release-containerd.yml index 3981d73d..925d9fdc 100644 --- a/.github/workflows/release-containerd.yml +++ b/.github/workflows/release-containerd.yml @@ -8,15 +8,11 @@ on: workflow_dispatch: inputs: ref: - description: 'Ref (e.g. v1.6.15)' + description: 'Tag/ref to build (e.g. v1.6.15)' required: true type: string - repo: - description: 'Override default repo' - required: false - type: string release: - description: 'Release type' + description: '(optional) Release type' required: false default: 'pushonly' type: choice @@ -26,7 +22,7 @@ on: - prerelease - release distros: - description: 'Distros to build (comma-separated, e.g. "debian12,ubuntu22.04")' + description: '(optional, empty = all supported) Distros to build (comma-separated, e.g. "debian12,ubuntu2204")' required: false type: string default: '' @@ -37,6 +33,10 @@ on: required: false type: string default: '' + repo: + description: '(optional) Override default repo (if want to build from a different Github repo/fork)' + required: false + type: string jobs: release: diff --git a/.github/workflows/release-credential-helpers.yml b/.github/workflows/release-credential-helpers.yml index 4b3016bf..7af03896 100644 --- a/.github/workflows/release-credential-helpers.yml +++ b/.github/workflows/release-credential-helpers.yml @@ -8,15 +8,11 @@ on: workflow_dispatch: inputs: ref: - description: 'Ref (e.g. v1.7.0)' + description: 'Tag/ref to build (e.g. v1.7.0)' required: true type: string - repo: - description: 'Override default repo' - required: false - type: string release: - description: 'Release type' + description: '(optional) Release type' required: false default: 'pushonly' type: choice @@ -26,7 +22,7 @@ on: - prerelease - release distros: - description: 'Distros to build (comma-separated, e.g. "debian12,ubuntu22.04")' + description: '(optional, empty = all supported) Distros to build (comma-separated, e.g. "debian12,ubuntu2204")' required: false type: string default: '' @@ -37,6 +33,10 @@ on: required: false type: string default: '' + repo: + description: '(optional) Override default repo (if want to build from a different Github repo/fork)' + required: false + type: string jobs: release: diff --git a/.github/workflows/release-docker-cli.yml b/.github/workflows/release-docker-cli.yml index 14df59c1..cf5c1b7a 100644 --- a/.github/workflows/release-docker-cli.yml +++ b/.github/workflows/release-docker-cli.yml @@ -8,15 +8,11 @@ on: workflow_dispatch: inputs: ref: - description: 'Ref (e.g. v23.0.0)' + description: 'Tag/ref to build (e.g. v23.0.0)' required: true type: string - repo: - description: 'Override default repo' - required: false - type: string release: - description: 'Release type' + description: '(optional) Release type' required: false default: 'pushonly' type: choice @@ -26,7 +22,7 @@ on: - prerelease - release distros: - description: 'Distros to build (comma-separated, e.g. "debian12,ubuntu22.04")' + description: '(optional, empty = all supported) Distros to build (comma-separated, e.g. "debian12,ubuntu2204")' required: false type: string default: '' @@ -37,6 +33,10 @@ on: required: false type: string default: '' + repo: + description: '(optional) Override default repo (if want to build from a different Github repo/fork)' + required: false + type: string jobs: release: diff --git a/.github/workflows/release-docker-engine.yml b/.github/workflows/release-docker-engine.yml index ba75dc2f..37cd1e3a 100644 --- a/.github/workflows/release-docker-engine.yml +++ b/.github/workflows/release-docker-engine.yml @@ -8,15 +8,11 @@ on: workflow_dispatch: inputs: ref: - description: 'Ref (e.g. v23.0.0)' + description: 'Tag/ref to build (e.g. v23.0.0)' required: true type: string - repo: - description: 'Override default repo' - required: false - type: string release: - description: 'Release type' + description: '(optional) Release type' required: false default: 'pushonly' type: choice @@ -26,7 +22,7 @@ on: - prerelease - release distros: - description: 'Distros to build (comma-separated, e.g. "debian12,ubuntu22.04")' + description: '(optional, empty = all supported) Distros to build (comma-separated, e.g. "debian12,ubuntu2204")' required: false type: string default: '' @@ -37,6 +33,10 @@ on: required: false type: string default: '' + repo: + description: '(optional) Override default repo (if want to build from a different Github repo/fork)' + required: false + type: string jobs: release: diff --git a/.github/workflows/release-model.yml b/.github/workflows/release-model.yml index a5a15947..a50d2186 100644 --- a/.github/workflows/release-model.yml +++ b/.github/workflows/release-model.yml @@ -8,15 +8,11 @@ on: workflow_dispatch: inputs: ref: - description: 'Ref (e.g. v0.1.30)' + description: 'Tag/ref to build (e.g. v0.1.30)' required: true type: string - repo: - description: 'Override default repo' - required: false - type: string release: - description: 'Release type' + description: '(optional) Release type' required: false default: 'pushonly' type: choice @@ -26,7 +22,7 @@ on: - prerelease - release distros: - description: 'Distros to build (comma-separated, e.g. "debian12,ubuntu22.04")' + description: '(optional, empty = all supported) Distros to build (comma-separated, e.g. "debian12,ubuntu2204")' required: false type: string default: '' @@ -37,6 +33,10 @@ on: required: false type: string default: '' + repo: + description: '(optional) Override default repo (if want to build from a different Github repo/fork)' + required: false + type: string jobs: release: From d02efe727f045cdbed9585271d71de0de9c1f06b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Fri, 31 Oct 2025 15:50:28 +0100 Subject: [PATCH 2/2] gha/release: Default to "draft" type MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The majority of runs are no longer test-only so I think it's fine to have a draft already in place that can be easily turned into a real github release. Signed-off-by: Paweł Gronowski --- .github/workflows/release-buildx.yml | 4 ++-- .github/workflows/release-cagent.yml | 4 ++-- .github/workflows/release-compose.yml | 4 ++-- .github/workflows/release-containerd.yml | 4 ++-- .github/workflows/release-credential-helpers.yml | 4 ++-- .github/workflows/release-docker-cli.yml | 4 ++-- .github/workflows/release-docker-engine.yml | 4 ++-- .github/workflows/release-model.yml | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/release-buildx.yml b/.github/workflows/release-buildx.yml index 4a2caec0..762925df 100644 --- a/.github/workflows/release-buildx.yml +++ b/.github/workflows/release-buildx.yml @@ -12,9 +12,9 @@ on: required: true type: string release: - description: '(optional) Release type' + description: '(optional) Release type to create in https://github.com/docker/packaging/releases' required: false - default: 'pushonly' + default: 'draft' type: choice options: - pushonly diff --git a/.github/workflows/release-cagent.yml b/.github/workflows/release-cagent.yml index 0108f3e5..ccf40038 100644 --- a/.github/workflows/release-cagent.yml +++ b/.github/workflows/release-cagent.yml @@ -12,9 +12,9 @@ on: required: true type: string release: - description: '(optional) Release type' + description: '(optional) Release type to create in https://github.com/docker/packaging/releases' required: false - default: 'pushonly' + default: 'draft' type: choice options: - pushonly diff --git a/.github/workflows/release-compose.yml b/.github/workflows/release-compose.yml index cb166858..454267f0 100644 --- a/.github/workflows/release-compose.yml +++ b/.github/workflows/release-compose.yml @@ -12,9 +12,9 @@ on: required: true type: string release: - description: '(optional) Release type' + description: '(optional) Release type to create in https://github.com/docker/packaging/releases' required: false - default: 'pushonly' + default: 'draft' type: choice options: - pushonly diff --git a/.github/workflows/release-containerd.yml b/.github/workflows/release-containerd.yml index 925d9fdc..dd03c4bb 100644 --- a/.github/workflows/release-containerd.yml +++ b/.github/workflows/release-containerd.yml @@ -12,9 +12,9 @@ on: required: true type: string release: - description: '(optional) Release type' + description: '(optional) Release type to create in https://github.com/docker/packaging/releases' required: false - default: 'pushonly' + default: 'draft' type: choice options: - pushonly diff --git a/.github/workflows/release-credential-helpers.yml b/.github/workflows/release-credential-helpers.yml index 7af03896..4aae7fca 100644 --- a/.github/workflows/release-credential-helpers.yml +++ b/.github/workflows/release-credential-helpers.yml @@ -12,9 +12,9 @@ on: required: true type: string release: - description: '(optional) Release type' + description: '(optional) Release type to create in https://github.com/docker/packaging/releases' required: false - default: 'pushonly' + default: 'draft' type: choice options: - pushonly diff --git a/.github/workflows/release-docker-cli.yml b/.github/workflows/release-docker-cli.yml index cf5c1b7a..d961e400 100644 --- a/.github/workflows/release-docker-cli.yml +++ b/.github/workflows/release-docker-cli.yml @@ -12,9 +12,9 @@ on: required: true type: string release: - description: '(optional) Release type' + description: '(optional) Release type to create in https://github.com/docker/packaging/releases' required: false - default: 'pushonly' + default: 'draft' type: choice options: - pushonly diff --git a/.github/workflows/release-docker-engine.yml b/.github/workflows/release-docker-engine.yml index 37cd1e3a..61a69011 100644 --- a/.github/workflows/release-docker-engine.yml +++ b/.github/workflows/release-docker-engine.yml @@ -12,9 +12,9 @@ on: required: true type: string release: - description: '(optional) Release type' + description: '(optional) Release type to create in https://github.com/docker/packaging/releases' required: false - default: 'pushonly' + default: 'draft' type: choice options: - pushonly diff --git a/.github/workflows/release-model.yml b/.github/workflows/release-model.yml index a50d2186..cbd21a50 100644 --- a/.github/workflows/release-model.yml +++ b/.github/workflows/release-model.yml @@ -12,9 +12,9 @@ on: required: true type: string release: - description: '(optional) Release type' + description: '(optional) Release type to create in https://github.com/docker/packaging/releases' required: false - default: 'pushonly' + default: 'draft' type: choice options: - pushonly