Skip to content

Commit 77e73bf

Browse files
authored
Merge pull request #62 from mfa777/develop #skip-docker
Remove :noimage support and refine release publishing logic
2 parents 9b346af + 85d50ea commit 77e73bf

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

.github/workflows/release-on-master-merge.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ jobs:
2727
id: docker_policy
2828
run: |
2929
commit_message="$(git log -1 --pretty=%B)"
30-
if grep -Eq '(#skip-docker|:noimage)' <<<"$commit_message"; then
30+
if grep -Eq '#skip-docker' <<<"$commit_message"; then
3131
echo "skip_docker=true" >> "$GITHUB_OUTPUT"
32-
echo "Docker image publishing disabled for this release via #skip-docker / :noimage."
32+
echo "Docker image publishing disabled for this release via #skip-docker."
3333
else
3434
echo "skip_docker=false" >> "$GITHUB_OUTPUT"
3535
fi
@@ -60,7 +60,7 @@ jobs:
6060
needs:
6161
- create-semver-tag
6262
- build-and-push-images
63-
if: needs.create-semver-tag.outputs.release_tag != '' && (needs.build-and-push-images.result == 'success' || needs.build-and-push-images.result == 'skipped')
63+
if: needs.create-semver-tag.outputs.release_tag != '' && (needs.create-semver-tag.outputs.skip_docker == 'true' || needs.build-and-push-images.result == 'success')
6464
runs-on: ubuntu-latest
6565
permissions:
6666
contents: write
@@ -77,7 +77,7 @@ jobs:
7777
echo "Commit: ${{ github.event.pull_request.merge_commit_sha }}"
7878
echo "Merged PR: #${{ github.event.pull_request.number }}"
7979
echo "Merged by: ${{ github.event.pull_request.merged_by.login }}"
80-
echo "Docker images: ${{ needs.create-semver-tag.outputs.skip_docker == 'true' && 'skipped (#skip-docker / :noimage)' || 'published' }}"
80+
echo "Docker images: ${{ needs.create-semver-tag.outputs.skip_docker == 'true' && 'skipped (#skip-docker)' || 'published' }}"
8181
} > "$release_asset"
8282
echo "release_asset=$release_asset" >> "$GITHUB_OUTPUT"
8383

docs/BUILD_AND_PUSH.md

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

0 commit comments

Comments
 (0)