Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion .github/actions/build-release-image/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,19 @@ outputs:
runs:
using: "composite"
steps:
- id: set-image-tag
shell: bash
run: |
# not strictly required as long as the calling workflow has checked out
# the repo with the correct ref, but for good measure and making this
# composite action not have a hard requirement on the git repo, we can
# set the tag to the specified commit hash
echo "IMAGE_TAG=${{ inputs.commit_hash }}" >> "$GITHUB_ENV"

- id: get-image-identifier
shell: bash
run: |
IMAGE_NAME=$(make APP_NAME=${{ inputs.app_name }} release-image-name)
IMAGE_TAG=$(make release-image-tag)
echo "image=$IMAGE_NAME:$IMAGE_TAG" >> "$GITHUB_OUTPUT"

- name: Set up Docker Buildx
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-and-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
ref: ${{ inputs.ref }}
ref: ${{ needs.get-commit-hash.outputs.commit_hash }}

- name: Set up Terraform
uses: ./.github/actions/setup-terraform
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cd-{{app_name}}.yml.jinja
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Deploy {{ app_name }}
# Need to set a default value for when the workflow is triggered from a git push
# which bypasses the default configuration for inputs
run-name: Deploy ${{'{{'}}inputs.version || 'main' {{'}}'}} to {{ app_name }} ${{'{{'}} inputs.environment || 'dev' {{'}}'}}
run-name: Deploy ${{'{{'}} inputs.version || github.sha {{'}}'}} to {{ app_name }} ${{'{{'}} inputs.environment || 'dev' {{'}}'}}
Copy link
Contributor Author

@doshitan doshitan Nov 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could potentially use github.ref here instead for a more skimmable name, but lean towards using what is ultimately the input.


on:
{% if app_has_dev_env_setup %}
Expand Down Expand Up @@ -51,5 +51,5 @@ jobs:
with:
app_name: "{{ app_name }}"
environment: ${{'{{'}} inputs.environment || 'dev' {{'}}'}}
version: ${{'{{'}} inputs.version || 'main' {{'}}'}}
version: ${{'{{'}} inputs.version || github.sha {{'}}'}}
secrets: inherit