Update GitHub Actions workflow to set VERSION to 'master' when the github.head_ref is 'master'.

This prevents attempting to extract a version from the branch name when on the master branch, ensuring the Docker image is tagged correctly.
This commit is contained in:
mjanez 2024-09-24 08:48:00 +02:00
parent 3a83875208
commit d8f5bbe39f
No known key found for this signature in database
GPG Key ID: 7A62FDE17C5A4929
1 changed files with 13 additions and 8 deletions

View File

@ -3,13 +3,13 @@ name: Build and push ckan-docker image from PR Merge
on:
pull_request:
types:
- closed
- closed
branches:
- master
- 'ckan-*.*.*'
- '!dev/ckan-*.*.*'
- '!feature/*'
- '!fix/*'
- master
- 'ckan-*.*.*'
- '!dev/ckan-*.*.*'
- '!feature/*'
- '!fix/*'
env:
REGISTRY: ghcr.io
@ -45,7 +45,12 @@ jobs:
- name: Extract tag version from branch name
id: extract_tag_version
run: echo "VERSION=$(echo ${{ github.head_ref }} | sed 's/^ckan-//')" >> $GITHUB_ENV
run: |
if [ "${{ github.head_ref }}" = "master" ]; then
echo "VERSION=master" >> $GITHUB_ENV
else
echo "VERSION=$(echo ${{ github.head_ref }} | sed 's/^ckan-//')" >> $GITHUB_ENV
fi
- name: Extract Docker metadata
id: meta
@ -81,7 +86,7 @@ jobs:
image-ref: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.VERSION }}
format: sarif
output: trivy-results.sarif
- name: Upload Trivy scan results to GitHub Security tab
uses: github/codeql-action/upload-sarif@v3
if: always()