Skip to content

Commit d1018eb

Browse files
committed
FIX GitHub action triggering for building image
1 parent b4fd48d commit d1018eb

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

.github/workflows/build-and-push.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
docker image push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }}-${{matrix.arch}}
4444
4545
manifest_build_and_push_on_feature:
46-
if: github.ref != 'refs/heads/main'
46+
if: github.ref != 'refs/heads/main' && !startsWith(github.ref, 'refs/tags/')
4747
needs: build_and_push
4848
runs-on: ubuntu-24.04
4949
steps:
@@ -64,8 +64,8 @@ jobs:
6464
run: |
6565
docker manifest push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }}
6666
67-
manifest_build_and_push_on_main:
68-
if: github.ref == 'refs/heads/main'
67+
manifest_build_and_push_on_tag:
68+
if: startsWith(github.ref, 'refs/tags/')
6969
needs: build_and_push
7070
runs-on: ubuntu-24.04
7171
steps:

CHANGES.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# CHANGELOG
22

3+
## Version 1.1.1
4+
5+
### Fix
6+
7+
* .github/workflows/build-and-push.yml manifest_build_and_push_on_feature no longer wrongs on tag creation
8+
* .github/workflows/build-and-push.yml manifest_build_and_push_on_tag now correctly builds on tag creation
9+
310
## Version 1.1.0
411

512
### Add
@@ -26,13 +33,13 @@
2633
* PHP version bumped to 8.5
2734
* Refactored multi-arch build process to prevent cross-arch builds requiring long wait times
2835

29-
### Fixes
36+
### Fix
3037

3138
* README.md usage instructions more detailed
3239

3340
### Miscellaneous
3441

35-
### Removed
42+
### Remove
3643

3744
* Build tools from final stage of Dockerfile
3845
* GitHub action to Setup QEMU as GitHub now provides native ARM runners

0 commit comments

Comments
 (0)