Skip to content

Add --dev-stream filter and dev-channel support #436

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

Closed
bschwedler wants to merge 13 commits into from
Closed

Add --dev-stream filter and dev-channel support #436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
321e3df
Add --release-stream filter for dev version builds
bschwedler Apr 9, 2026
929e407
Fix workflow input syntax and add stream filter test
bschwedler Apr 9, 2026
e2dae8d
Rename to --dev-stream, add values passthrough for URLs
bschwedler Apr 9, 2026
f0f69c9
Add --value flag to ci matrix and build commands
bschwedler Apr 9, 2026
4441ff8
Add dev-channel input to shared workflows
bschwedler Apr 9, 2026
7b531f3
Add test for channel override with real codename
bschwedler Apr 9, 2026
327e5b4
Fix shell injection and test false-positive
bschwedler Apr 9, 2026
e43171a
Thread value overrides instead of mutating model
bschwedler Apr 13, 2026
3c1b33a
Handle missing URL placeholders and fix naming
bschwedler Apr 13, 2026
fe11468
Plumb dev-stream and dev-channel through all steps
bschwedler Apr 13, 2026
40d9575
Add image-version filter to shared workflows
bschwedler Apr 13, 2026
79a0ffc
Fix filter=None crash and stale test import
bschwedler Apr 13, 2026
c00b523
Update cross-repo workflow diagrams
bschwedler Apr 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 60 additions & 33 deletions .github/workflows/bakery-build-native.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,21 @@ on:
default: "exclude"
required: false
type: string
image-version:
description: "Filter to a specific image version (e.g. product version from upstream dispatch)"
default: ""
required: false
type: string
dev-stream:
description: "Filter dev versions to a specific release stream (e.g. 'daily', 'preview')"
default: ""
required: false
type: string
dev-channel:
description: "Upstream channel reference (e.g. branch codename for Workbench preview)"
default: ""
required: false
type: string
push:
description: "Whether to push images to registries [default: false]"
default: false
Expand Down Expand Up @@ -105,17 +120,31 @@ jobs:
env:
DEV_VERSIONS: ${{ inputs.dev-versions }}
MATRIX_VERSIONS: ${{ inputs.matrix-versions }}
IMAGE_VERSION: ${{ inputs.image-version }}
CONTEXT: ${{ inputs.context }}
DEV_STREAM: ${{ inputs.dev-stream }}
DEV_CHANNEL: ${{ inputs.dev-channel }}
run: |
echo "platform_matrix=$(bakery ci matrix --quiet --dev-versions "$DEV_VERSIONS" --matrix-versions "$MATRIX_VERSIONS" --context "$CONTEXT" | jq --compact-output .)" >> $GITHUB_OUTPUT
ARGS=(--quiet --dev-versions "$DEV_VERSIONS" --matrix-versions "$MATRIX_VERSIONS" --context "$CONTEXT")
[[ -n "$IMAGE_VERSION" ]] && ARGS+=(--image-version "$IMAGE_VERSION")
[[ -n "$DEV_STREAM" ]] && ARGS+=(--dev-stream "$DEV_STREAM")
[[ -n "$DEV_CHANNEL" ]] && ARGS+=(--value "channel=$DEV_CHANNEL")
echo "platform_matrix=$(bakery ci matrix "${ARGS[@]}" | jq --compact-output .)" >> $GITHUB_OUTPUT
- name: Images by Version
id: images-by-version
env:
DEV_VERSIONS: ${{ inputs.dev-versions }}
MATRIX_VERSIONS: ${{ inputs.matrix-versions }}
IMAGE_VERSION: ${{ inputs.image-version }}
CONTEXT: ${{ inputs.context }}
DEV_STREAM: ${{ inputs.dev-stream }}
DEV_CHANNEL: ${{ inputs.dev-channel }}
run: |
echo "versions_matrix=$(bakery ci matrix --quiet --dev-versions "$DEV_VERSIONS" --matrix-versions "$MATRIX_VERSIONS" --exclude platform --context "$CONTEXT" | jq --compact-output .)" >> $GITHUB_OUTPUT
ARGS=(--quiet --dev-versions "$DEV_VERSIONS" --matrix-versions "$MATRIX_VERSIONS" --exclude platform --context "$CONTEXT")
[[ -n "$IMAGE_VERSION" ]] && ARGS+=(--image-version "$IMAGE_VERSION")
[[ -n "$DEV_STREAM" ]] && ARGS+=(--dev-stream "$DEV_STREAM")
[[ -n "$DEV_CHANNEL" ]] && ARGS+=(--value "channel=$DEV_CHANNEL")
echo "versions_matrix=$(bakery ci matrix "${ARGS[@]}" | jq --compact-output .)" >> $GITHUB_OUTPUT

build-test:
name: "Build/Test ${{ matrix.img.image }}:${{ matrix.img.version }} (${{ matrix.img.platform }})"
Expand Down Expand Up @@ -209,44 +238,43 @@ jobs:
IMAGE_PLATFORM: ${{ matrix.img.platform }}
DEV_VERSIONS: ${{ inputs.dev-versions }}
MATRIX_VERSIONS: ${{ inputs.matrix-versions }}
DEV_STREAM: ${{ inputs.dev-stream }}
DEV_CHANNEL: ${{ inputs.dev-channel }}
REGISTRY: ghcr.io/${{ github.repository_owner }}
NORMALIZED_PLATFORM: ${{ steps.normalize-platform.outputs.platform }}
CONTEXT: ${{ inputs.context }}
# Cache-to is conditional on --push (handled by bakery internally)
run: |
bakery build \
--strategy build --pull \
--retry "$RETRY" \
--image-name "^${IMAGE_NAME}$" \
--image-version "$IMAGE_VERSION" \
--image-platform "$IMAGE_PLATFORM" \
--dev-versions "$DEV_VERSIONS" \
--matrix-versions "$MATRIX_VERSIONS" \
--cache-registry "$REGISTRY" \
--temp-registry "$REGISTRY" \
--metadata-file "./${IMAGE_NAME}-${IMAGE_VERSION}-${NORMALIZED_PLATFORM}-metadata.json" \
--context "$CONTEXT" \
--push
ARGS=(--strategy build --pull --retry "$RETRY")
ARGS+=(--image-name "^${IMAGE_NAME}$" --image-version "$IMAGE_VERSION" --image-platform "$IMAGE_PLATFORM")
ARGS+=(--dev-versions "$DEV_VERSIONS" --matrix-versions "$MATRIX_VERSIONS")
ARGS+=(--cache-registry "$REGISTRY" --temp-registry "$REGISTRY")
ARGS+=(--metadata-file "./${IMAGE_NAME}-${IMAGE_VERSION}-${NORMALIZED_PLATFORM}-metadata.json")
ARGS+=(--context "$CONTEXT" --push)
[[ -n "$DEV_STREAM" ]] && ARGS+=(--dev-stream "$DEV_STREAM")
[[ -n "$DEV_CHANNEL" ]] && ARGS+=(--value "channel=$DEV_CHANNEL")
bakery build "${ARGS[@]}"
- name: Test
env:
IMAGE_NAME: ${{ matrix.img.image }}
IMAGE_VERSION: ${{ matrix.img.version }}
IMAGE_PLATFORM: ${{ matrix.img.platform }}
DEV_VERSIONS: ${{ inputs.dev-versions }}
MATRIX_VERSIONS: ${{ inputs.matrix-versions }}
DEV_STREAM: ${{ inputs.dev-stream }}
DEV_CHANNEL: ${{ inputs.dev-channel }}
NORMALIZED_PLATFORM: ${{ steps.normalize-platform.outputs.platform }}
CONTEXT: ${{ inputs.context }}
run: |
ARGS=(--image-name "^${IMAGE_NAME}$" --image-version "$IMAGE_VERSION" --image-platform "$IMAGE_PLATFORM")
ARGS+=(--dev-versions "$DEV_VERSIONS" --matrix-versions "$MATRIX_VERSIONS")
ARGS+=(--metadata-file "./${IMAGE_NAME}-${IMAGE_VERSION}-${NORMALIZED_PLATFORM}-metadata.json")
ARGS+=(--context "$CONTEXT")
[[ -n "$DEV_STREAM" ]] && ARGS+=(--dev-stream "$DEV_STREAM")
[[ -n "$DEV_CHANNEL" ]] && ARGS+=(--value "channel=$DEV_CHANNEL")
GOSS_PATH=${GITHUB_WORKSPACE}/tools/goss \
DGOSS_PATH=${GITHUB_WORKSPACE}/tools/dgoss \
bakery run dgoss \
--image-name "^${IMAGE_NAME}$" \
--image-version "$IMAGE_VERSION" \
--image-platform "$IMAGE_PLATFORM" \
--dev-versions "$DEV_VERSIONS" \
--matrix-versions "$MATRIX_VERSIONS" \
--metadata-file "./${IMAGE_NAME}-${IMAGE_VERSION}-${NORMALIZED_PLATFORM}-metadata.json" \
--context "$CONTEXT"
bakery run dgoss "${ARGS[@]}"
- name: Upload Metadata
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
with:
Expand Down Expand Up @@ -346,13 +374,12 @@ jobs:
CONTEXT: ${{ inputs.context }}
REGISTRY: ghcr.io/${{ github.repository_owner }}
PUSH: ${{ inputs.push }}
DEV_CHANNEL: ${{ inputs.dev-channel }}
run: |
if [ "$PUSH" = "true" ]; then PUSH_FLAG=""; else PUSH_FLAG="--dry-run"; fi
bakery ci merge \
--context "$CONTEXT" \
--temp-registry "$REGISTRY" \
$PUSH_FLAG \
*-metadata.json
ARGS=(--context "$CONTEXT" --temp-registry "$REGISTRY")
[[ -n "$DEV_CHANNEL" ]] && ARGS+=(--value "channel=$DEV_CHANNEL")
if [ "$PUSH" != "true" ]; then ARGS+=(--dry-run); fi
bakery ci merge "${ARGS[@]}" *-metadata.json

readme:
name: Push READMEs
Expand All @@ -379,8 +406,8 @@ jobs:
CONTEXT: ${{ inputs.context }}
DEV_VERSIONS: ${{ inputs.dev-versions }}
MATRIX_VERSIONS: ${{ inputs.matrix-versions }}
DEV_CHANNEL: ${{ inputs.dev-channel }}
run: |
bakery ci readme \
--context "$CONTEXT" \
--dev-versions "$DEV_VERSIONS" \
--matrix-versions "$MATRIX_VERSIONS"
ARGS=(--context "$CONTEXT" --dev-versions "$DEV_VERSIONS" --matrix-versions "$MATRIX_VERSIONS")
[[ -n "$DEV_CHANNEL" ]] && ARGS+=(--value "channel=$DEV_CHANNEL")
bakery ci readme "${ARGS[@]}"
79 changes: 53 additions & 26 deletions .github/workflows/bakery-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,21 @@ on:
default: "exclude"
required: false
type: string
image-version:
description: "Filter to a specific image version (e.g. product version from upstream dispatch)"
default: ""
required: false
type: string
dev-stream:
description: "Filter dev versions to a specific release stream (e.g. 'daily', 'preview')"
default: ""
required: false
type: string
dev-channel:
description: "Upstream channel reference (e.g. branch codename for Workbench preview)"
default: ""
required: false
type: string
push:
description: "Whether to push images to registries [default: false]"
default: false
Expand Down Expand Up @@ -95,9 +110,16 @@ jobs:
env:
DEV_VERSIONS: ${{ inputs.dev-versions }}
MATRIX_VERSIONS: ${{ inputs.matrix-versions }}
IMAGE_VERSION: ${{ inputs.image-version }}
CONTEXT: ${{ inputs.context }}
DEV_STREAM: ${{ inputs.dev-stream }}
DEV_CHANNEL: ${{ inputs.dev-channel }}
run: |
echo "matrix=$(bakery ci matrix --quiet --dev-versions "$DEV_VERSIONS" --matrix-versions "$MATRIX_VERSIONS" --context "$CONTEXT" | jq --compact-output .)" >> $GITHUB_OUTPUT
ARGS=(--quiet --dev-versions "$DEV_VERSIONS" --matrix-versions "$MATRIX_VERSIONS" --context "$CONTEXT")
[[ -n "$IMAGE_VERSION" ]] && ARGS+=(--image-version "$IMAGE_VERSION")
[[ -n "$DEV_STREAM" ]] && ARGS+=(--dev-stream "$DEV_STREAM")
[[ -n "$DEV_CHANNEL" ]] && ARGS+=(--value "channel=$DEV_CHANNEL")
echo "matrix=$(bakery ci matrix "${ARGS[@]}" | jq --compact-output .)" >> $GITHUB_OUTPUT

build:
name: "${{ matrix.img.image }}:${{ matrix.img.version }}"
Expand Down Expand Up @@ -174,34 +196,37 @@ jobs:
IMAGE_VERSION: ${{ matrix.img.version }}
DEV_VERSIONS: ${{ inputs.dev-versions }}
MATRIX_VERSIONS: ${{ inputs.matrix-versions }}
DEV_STREAM: ${{ inputs.dev-stream }}
DEV_CHANNEL: ${{ inputs.dev-channel }}
REGISTRY: ghcr.io/${{ github.repository_owner }}
CONTEXT: ${{ inputs.context }}
run: |
bakery build --load --pull \
--retry "$RETRY" \
--image-name "^${IMAGE_NAME}$" \
--image-version "$IMAGE_VERSION" \
--dev-versions "$DEV_VERSIONS" \
--matrix-versions "$MATRIX_VERSIONS" \
--cache-registry "$REGISTRY" \
--context "$CONTEXT"
ARGS=(--load --pull --retry "$RETRY")
ARGS+=(--image-name "^${IMAGE_NAME}$" --image-version "$IMAGE_VERSION")
ARGS+=(--dev-versions "$DEV_VERSIONS" --matrix-versions "$MATRIX_VERSIONS")
ARGS+=(--cache-registry "$REGISTRY" --context "$CONTEXT")
[[ -n "$DEV_STREAM" ]] && ARGS+=(--dev-stream "$DEV_STREAM")
[[ -n "$DEV_CHANNEL" ]] && ARGS+=(--value "channel=$DEV_CHANNEL")
bakery build "${ARGS[@]}"

- name: Test
env:
IMAGE_NAME: ${{ matrix.img.image }}
IMAGE_VERSION: ${{ matrix.img.version }}
DEV_VERSIONS: ${{ inputs.dev-versions }}
MATRIX_VERSIONS: ${{ inputs.matrix-versions }}
DEV_STREAM: ${{ inputs.dev-stream }}
DEV_CHANNEL: ${{ inputs.dev-channel }}
CONTEXT: ${{ inputs.context }}
run: |
ARGS=(--image-name "^${IMAGE_NAME}$" --image-version "$IMAGE_VERSION")
ARGS+=(--dev-versions "$DEV_VERSIONS" --matrix-versions "$MATRIX_VERSIONS")
ARGS+=(--context "$CONTEXT")
[[ -n "$DEV_STREAM" ]] && ARGS+=(--dev-stream "$DEV_STREAM")
[[ -n "$DEV_CHANNEL" ]] && ARGS+=(--value "channel=$DEV_CHANNEL")
GOSS_PATH=${GITHUB_WORKSPACE}/tools/goss \
DGOSS_PATH=${GITHUB_WORKSPACE}/tools/dgoss \
bakery run dgoss \
--image-name "^${IMAGE_NAME}$" \
--image-version "$IMAGE_VERSION" \
--dev-versions "$DEV_VERSIONS" \
--matrix-versions "$MATRIX_VERSIONS" \
--context "$CONTEXT"
bakery run dgoss "${ARGS[@]}"

- name: Push
# Since this is a reusable workflow, we need to be very explicit about
Expand All @@ -215,15 +240,17 @@ jobs:
IMAGE_VERSION: ${{ matrix.img.version }}
DEV_VERSIONS: ${{ inputs.dev-versions }}
MATRIX_VERSIONS: ${{ inputs.matrix-versions }}
DEV_STREAM: ${{ inputs.dev-stream }}
DEV_CHANNEL: ${{ inputs.dev-channel }}
CONTEXT: ${{ inputs.context }}
run: |
bakery build --push --pull \
--retry "$RETRY" \
--image-name "^${IMAGE_NAME}$" \
--image-version "$IMAGE_VERSION" \
--dev-versions "$DEV_VERSIONS" \
--matrix-versions "$MATRIX_VERSIONS" \
--context "$CONTEXT"
ARGS=(--push --pull --retry "$RETRY")
ARGS+=(--image-name "^${IMAGE_NAME}$" --image-version "$IMAGE_VERSION")
ARGS+=(--dev-versions "$DEV_VERSIONS" --matrix-versions "$MATRIX_VERSIONS")
ARGS+=(--context "$CONTEXT")
[[ -n "$DEV_STREAM" ]] && ARGS+=(--dev-stream "$DEV_STREAM")
[[ -n "$DEV_CHANNEL" ]] && ARGS+=(--value "channel=$DEV_CHANNEL")
bakery build "${ARGS[@]}"

readme:
name: Push READMEs
Expand All @@ -250,8 +277,8 @@ jobs:
CONTEXT: ${{ inputs.context }}
DEV_VERSIONS: ${{ inputs.dev-versions }}
MATRIX_VERSIONS: ${{ inputs.matrix-versions }}
DEV_CHANNEL: ${{ inputs.dev-channel }}
run: |
bakery ci readme \
--context "$CONTEXT" \
--dev-versions "$DEV_VERSIONS" \
--matrix-versions "$MATRIX_VERSIONS"
ARGS=(--context "$CONTEXT" --dev-versions "$DEV_VERSIONS" --matrix-versions "$MATRIX_VERSIONS")
[[ -n "$DEV_CHANNEL" ]] && ARGS+=(--value "channel=$DEV_CHANNEL")
bakery ci readme "${ARGS[@]}"
Loading
Loading