Skip to content

fix(ci): remove tag fallback in merge flow #498

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

Merged
DerekRoberts merged 1 commit into from
Sep 25, 2026
Merged

fix(ci): remove tag fallback in merge flow #498

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 3 additions & 10 deletions .github/workflows/merge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,6 @@ on:
- ".graphics/**"
- "!.github/workflows/**"
workflow_dispatch:
inputs:
tag:
description: "Image tag to deploy; e.g. PR number or prod"
type: string
default: "prod"

concurrency:
group: ${{ github.workflow }}
Expand All @@ -39,15 +34,13 @@ jobs:
# Resolve the image digest built for this commit (squash merges walk back to the PR build)
- name: Resolve image
id: tracker
if: ${{ !inputs.tag }}
uses: bcgov/actions/image-tracker@4026bfd276b8a5839029106099b13edfb594b2c3 # v0.8.0
with:
package: ${{ matrix.package }}
max_depth: 100

# Tag that digest with the merge commit SHA; deploys and promotion use this tag
- name: Tag image with commit SHA
if: ${{ !inputs.tag }}
uses: shrink/actions-docker-registry-tag@e6aaef25c595b6e0edd18bf4c7dbfea3abd43299 # v5
with:
registry: ghcr.io
Expand All @@ -68,7 +61,7 @@ jobs:
with:
environment: test
target: test
tag: ${{ inputs.tag || github.sha }}
tag: ${{ github.sha }}

integration-tests:
name: Integration Tests for APIs
Expand Down Expand Up @@ -112,7 +105,7 @@ jobs:
with:
environment: prod
target: prod
tag: ${{ inputs.tag || github.sha }}
tag: ${{ github.sha }}

promote:
name: Promote Images
Expand All @@ -129,5 +122,5 @@ jobs:
with:
registry: ghcr.io
repository: ${{ github.repository }}/${{ matrix.package }}
target: ${{ inputs.tag || github.sha }}
target: ${{ github.sha }}
tags: prod
Loading