Skip to content

Commit

Permalink
Merge pull request #66 from mikeiken/dev
Browse files Browse the repository at this point in the history
Update release workflow to set IS_RELEASE based on pull request merge status
  • Loading branch information
Kseen715 authored Oct 21, 2024
2 parents 1f37e2f + c531650 commit 333588c
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion .github/workflows/on-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:
env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}
IS_RELEASE: ${{ github.event_name == 'release' }}
IS_RELEASE: ${{ github.event.pull_request.merged }}
# IS_RELEASE: True
DJANGO_SUFFIX: -django
FRONTEND_SUFFIX: -frontend
Expand All @@ -40,6 +40,7 @@ jobs:
echo "FRONTEND_SUFFIX: ${{ env.FRONTEND_SUFFIX }}"
echo "NGINX_SUFFIX: ${{ env.NGINX_SUFFIX }}"
echo "PSQL_SUFFIX: ${{ env.PSQL_SUFFIX }}"
echo "PULL_REQUEST_MERGED: ${{ github.event.pull_request.merged }}"
build-and-push-image-django:
runs-on: ubuntu-latest
# Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job.
Expand Down

0 comments on commit 333588c

Please sign in to comment.