Skip to content
Merged
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
8 changes: 4 additions & 4 deletions .github/workflows/release-on-master-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ jobs:
id: docker_policy
run: |
commit_message="$(git log -1 --pretty=%B)"
if grep -Eq '(#skip-docker|:noimage)' <<<"$commit_message"; then
if grep -Eq '#skip-docker' <<<"$commit_message"; then
echo "skip_docker=true" >> "$GITHUB_OUTPUT"
echo "Docker image publishing disabled for this release via #skip-docker / :noimage."
echo "Docker image publishing disabled for this release via #skip-docker."
else
echo "skip_docker=false" >> "$GITHUB_OUTPUT"
fi
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
needs:
- create-semver-tag
- build-and-push-images
if: needs.create-semver-tag.outputs.release_tag != '' && (needs.build-and-push-images.result == 'success' || needs.build-and-push-images.result == 'skipped')
if: needs.create-semver-tag.outputs.release_tag != '' && (needs.create-semver-tag.outputs.skip_docker == 'true' || needs.build-and-push-images.result == 'success')
runs-on: ubuntu-latest
permissions:
contents: write
Expand All @@ -77,7 +77,7 @@ jobs:
echo "Commit: ${{ github.event.pull_request.merge_commit_sha }}"
echo "Merged PR: #${{ github.event.pull_request.number }}"
echo "Merged by: ${{ github.event.pull_request.merged_by.login }}"
echo "Docker images: ${{ needs.create-semver-tag.outputs.skip_docker == 'true' && 'skipped (#skip-docker / :noimage)' || 'published' }}"
echo "Docker images: ${{ needs.create-semver-tag.outputs.skip_docker == 'true' && 'skipped (#skip-docker)' || 'published' }}"
} > "$release_asset"
echo "release_asset=$release_asset" >> "$GITHUB_OUTPUT"

Expand Down
2 changes: 1 addition & 1 deletion docs/BUILD_AND_PUSH.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ This repository contains GitHub Actions workflows that:
- On merged pull requests to `master`, it:
- calculates the next semantic version tag from the latest repository tag (current baseline: `v2.3.0`)
- defaults to a patch bump, unless the merge commit message includes `#major`, `#minor`, `#patch`, or `#none`
- skips Docker image build/push when the merge commit message includes `#skip-docker` (`:noimage`)
- skips Docker image build/push when the merge commit message includes `#skip-docker`
- creates the new Git tag with `anothrNick/github-tag-action`
- builds two images and pushes them to Docker Hub with tags `latest` and the generated semantic version tag:
- `Dockerfile.postgres-walg` → `DOCKERHUB_USERNAME/pg-with-backup`
Expand Down
Loading