PPNA-5781 Simplify all of that

Author: mrfijas

README.md

@@ -746,44 +746,44 @@ Main idea is to automate bumping explicit tmp images in stack repo to allow test
 
 **How It Works:**
 
-For **dev branch commits**: When a commit is pushed to the configured development branch, it generates a version string like `tmp-cf3ebd52` and triggers the `update-service-version.yaml` workflow in the target repository. Commits that contain a GitHub Actions skip directive such as `[skip ci]`, `[ci skip]`, `[no ci]`, `[skip actions]`, `[actions skip]`, or the `skip-checks: true` trailer are ignored, including when this action is called from a `workflow_run` workflow.
+For **dev branch commits**: When a commit is pushed to the configured development branch and the image build succeeds, it generates a version string like `tmp-cf3ebd52` and triggers the `update-service-version.yaml` workflow in the target repository.
 
-For **tags**: When a tag is created, it extracts the tag name (e.g., `1.32.4`) and checks if the tagged commit exists in the configured development branch using `git merge-base --is-ancestor`. If the commit exists in that branch, it triggers the workflow with the tag name as version. If not, it skips triggering (assumes a hotfix released from `master` that has not been merged back yet). Tagged commits are also skipped if their commit message contains a GitHub Actions skip directive.
-
-For **other branches**: The action skips version updates. This is useful when it is called from a `workflow_run` workflow that observes builds for every branch, but should only bump versions for the configured development branch and release tags.
+For **tags**: When a tag is created, it extracts the tag name (e.g., `1.32.4`) and checks if the tagged commit exists in the configured development branch using `git merge-base --is-ancestor`. If the commit exists in that branch, it triggers the workflow with the tag name as version. If not, it skips triggering (assumes a hotfix released from `master` that has not been merged back yet).
 
 #### Usage
 
-```yaml .github/workflows/version_update.yaml
-name: Trigger version update
+```yaml .github/workflows/build_and_push.yaml
+name: Build and push the image
 
 on:
-  workflow_run:
-    # Name of the workflow that has to finish to trigger the version update  
-    workflows: ["Build and Test"]
-    types:
-      - completed
+  push:
 
 # explicitly limit action permissions 
 permissions:
   contents: read
 
 jobs:
-  trigger-update:
+  build-and-trigger:
     runs-on: ubuntu-latest
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
     steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+
+      - name: Build and push image
+        run: ./build-and-push-image.sh
+
       - name: Trigger version update
+        if: ${{ github.ref_name == github.event.repository.default_branch || startsWith(github.ref, 'refs/tags/') }}
         uses: PiwikPRO/actions/version-update/trigger@master
         with:
           service-name: reporting
-          dev-branch: develop
+          dev-branch: ${{ github.event.repository.default_branch }}
           target-repo: Promil-stack-analytics
           # Requires fine-grained PAT with "Actions: Read and write" permission as WORKFLOW_TRIGGER_TOKEN
           workflow-token: ${{ secrets.WORKFLOW_TRIGGER_TOKEN }}
 ```
 
-This example works when `Build and Test` runs on every push, including tags. The action itself only triggers version updates for commits on the configured `dev-branch` and for tags whose commits are already present in that branch.
+Place the action after the step that builds and pushes the image. This way version updates are only triggered after a successful image build, and skipped workflows do not need any extra handling inside the action. In the calling workflow, gate the step so it only runs for the development branch and for tags.
 
 #### Inputs
 

version-update/trigger/action.yaml

@@ -24,76 +24,34 @@ runs:
     - name: Checkout repository
       uses: actions/checkout@v6
       with:
-        ref: ${{ github.event_name == 'workflow_run' && github.event.workflow_run.head_sha || github.ref }}
         fetch-depth: 0  # Fetch all history for all branches and tags
 
     - name: Determine version and validate tag
       id: version
       shell: bash
       run: |
-        SOURCE_SHA="${{ github.sha }}"
-        SOURCE_REF="${{ github.ref }}"
-        SOURCE_BRANCH="${GITHUB_REF#refs/heads/}"
-
-        if [[ "${{ github.event_name }}" == "workflow_run" ]]; then
-          SOURCE_SHA="${{ github.event.workflow_run.head_sha }}"
-          SOURCE_BRANCH="${{ github.event.workflow_run.head_branch }}"
-
-          if [[ -n "$SOURCE_BRANCH" && "$SOURCE_BRANCH" == "${{ inputs.dev-branch }}" ]]; then
-            SOURCE_REF="refs/heads/$SOURCE_BRANCH"
-          else
-            mapfile -t SOURCE_TAGS < <(git tag --points-at "$SOURCE_SHA")
-
-            if [[ ${#SOURCE_TAGS[@]} -gt 0 ]]; then
-              SOURCE_REF="refs/tags/${SOURCE_TAGS[0]}"
-            else
-              SOURCE_REF="refs/heads/$SOURCE_BRANCH"
-            fi
-          fi
-        fi
-
-        echo "source_sha=$SOURCE_SHA" >> "$GITHUB_OUTPUT"
-        echo "source_ref=$SOURCE_REF" >> "$GITHUB_OUTPUT"
-        echo "source_branch=$SOURCE_BRANCH" >> "$GITHUB_OUTPUT"
-
-        COMMIT_MESSAGE="$(git log -1 --pretty=%B "$SOURCE_SHA" 2>/dev/null || true)"
-
-        # Match all skip instructions recognized by GitHub Actions.
-        if printf '%s\n' "$COMMIT_MESSAGE" | grep -Eiq '(^|[^[:alnum:]])\[(skip ci|ci skip|no ci|skip actions|actions skip)\]($|[^[:alnum:]])|(^|[[:space:]])skip-checks:[[:space:]]*true([[:space:]]|$)'; then
-          echo "⚠️ Commit message contains a GitHub Actions skip directive"
-          echo "Skipping version update trigger"
-          echo "should_trigger=false" >> "$GITHUB_OUTPUT"
-          echo "skip_reason=commit_message_skip_ci" >> "$GITHUB_OUTPUT"
-          exit 0
-        fi
-
-        if [[ "$SOURCE_REF" == refs/tags/* ]]; then
+        if [[ "${{ github.ref }}" == refs/tags/* ]]; then
           # Extract tag name
-          TAG="${SOURCE_REF#refs/tags/}"
+          TAG="${GITHUB_REF#refs/tags/}"
           echo "tag=$TAG" >> $GITHUB_OUTPUT
           
           # Check if this tag's commit exists in dev branch
-          if git merge-base --is-ancestor "$SOURCE_SHA" origin/${{ inputs.dev-branch }}; then
+          if git merge-base --is-ancestor "${{ github.sha }}" origin/${{ inputs.dev-branch }}; then
             echo "✅ Tag $TAG points to a commit that exists in ${{ inputs.dev-branch }} branch"
             echo "version=$TAG" >> $GITHUB_OUTPUT
             echo "should_trigger=true" >> $GITHUB_OUTPUT
           else
             echo "⚠️ Tag $TAG does not exist in ${{ inputs.dev-branch }} branch (likely a hotfix tag from master)"
             echo "Skipping version update trigger"
             echo "should_trigger=false" >> $GITHUB_OUTPUT
-            echo "skip_reason=tag_not_in_dev_branch" >> "$GITHUB_OUTPUT"
           fi
-        elif [[ "$SOURCE_BRANCH" == "${{ inputs.dev-branch }}" ]]; then
+        else
           # This is a push to the development branch.
-          SHA=$(echo "$SOURCE_SHA" | cut -c1-7)
+          SHA=$(echo "${{ github.sha }}" | cut -c1-7)
           echo "sha=$SHA" >> $GITHUB_OUTPUT
           echo "version=tmp-$SHA" >> $GITHUB_OUTPUT
           echo "should_trigger=true" >> $GITHUB_OUTPUT
           echo "Version will be: tmp-$SHA"
-        else
-          echo "Skipping version update trigger"
-          echo "should_trigger=false" >> "$GITHUB_OUTPUT"
-          echo "skip_reason=unsupported_source_ref" >> "$GITHUB_OUTPUT"
         fi
 
     - name: Trigger workflow_dispatch in target repository
@@ -127,7 +85,7 @@ runs:
         echo "- Version: **${{ steps.version.outputs.version }}**" >> $GITHUB_STEP_SUMMARY
         echo "- Target: ${{ inputs.target-repo }}" >> $GITHUB_STEP_SUMMARY
         echo "- Triggered by: ${{ github.actor }}" >> $GITHUB_STEP_SUMMARY
-        echo "- Source commit: \`${{ steps.version.outputs.source_sha }}\`" >> $GITHUB_STEP_SUMMARY
+        echo "- Source commit: \`${{ github.sha }}\`" >> $GITHUB_STEP_SUMMARY
         echo "" >> $GITHUB_STEP_SUMMARY
         echo "[View workflow runs in target repo →](https://github.com/${{ github.repository_owner }}/${{ inputs.target-repo }}/actions/workflows/update-service-version.yaml)" >> $GITHUB_STEP_SUMMARY
 
@@ -136,17 +94,7 @@ runs:
       shell: bash
       run: |
         echo "### Version Update Skipped" >> $GITHUB_STEP_SUMMARY
-        if [[ "${{ steps.version.outputs.skip_reason }}" == "commit_message_skip_ci" ]]; then
-          echo "⚠️ Source commit message contains a GitHub Actions skip directive." >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "Version updates are skipped to avoid bumping an image version when the source image build was intentionally skipped." >> $GITHUB_STEP_SUMMARY
-        elif [[ "${{ steps.version.outputs.skip_reason }}" == "unsupported_source_ref" ]]; then
-          echo "ℹ️ Source ref is not the configured development branch and is not a release tag." >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "Version updates only run for commits on **${{ inputs.dev-branch }}** or for tags that point to commits already present in that branch." >> $GITHUB_STEP_SUMMARY
-        else
-          echo "⚠️ Tag **${{ steps.version.outputs.tag }}** does not exist in ${{ inputs.dev-branch }} branch" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "This is likely a hotfix tag released directly from master." >> $GITHUB_STEP_SUMMARY
-          echo "Version updates are only triggered for tags that exist in the ${{ inputs.dev-branch }} branch." >> $GITHUB_STEP_SUMMARY
-        fi
+        echo "⚠️ Tag **${{ steps.version.outputs.tag }}** does not exist in ${{ inputs.dev-branch }} branch" >> $GITHUB_STEP_SUMMARY
+        echo "" >> $GITHUB_STEP_SUMMARY
+        echo "This is likely a hotfix tag released directly from master." >> $GITHUB_STEP_SUMMARY
+        echo "Version updates are only triggered for tags that exist in the ${{ inputs.dev-branch }} branch." >> $GITHUB_STEP_SUMMARY