Skip to content

Commit e14716a

Browse files
authored
Change results order to allow auto-merge (nginx#5788)
change results order to allow auto-merge
1 parent 603417c commit e14716a

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

.github/workflows/ci.yml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -733,23 +733,9 @@ jobs:
733733
path: ${{ github.workspace }}/tests/${{ steps.smoke-tests.outputs.test-results-name }}-${{ matrix.k8s }}.html
734734
if: always()
735735

736-
smoke-results:
737-
if: ${{ always() }}
738-
runs-on: ubuntu-22.04
739-
name: Final Smoke Test Results
740-
needs: [smoke-tests]
741-
steps:
742-
- run: |
743-
result="${{ needs.smoke-tests.result }}"
744-
if [[ $result == "success" || $result == "skipped" ]]; then
745-
exit 0
746-
else
747-
exit 1
748-
fi
749-
750736
tag-stable:
751737
name: Tag tested image as stable
752-
needs: [checks, smoke-results]
738+
needs: [checks, smoke-tests]
753739
permissions:
754740
contents: read # To checkout repository
755741
id-token: write # To sign into Google Container Registry
@@ -759,15 +745,29 @@ jobs:
759745
target_tag: ${{ needs.checks.outputs.stable_tag }}
760746
dry_run: false
761747
secrets: inherit
762-
if: ${{ inputs.force || (needs.checks.outputs.forked_workflow == 'false' && needs.smoke-results.result == 'success' && needs.checks.outputs.stable_image_exists != 'true' && needs.checks.outputs.docs_only == 'false') }}
748+
if: ${{ inputs.force || (needs.checks.outputs.forked_workflow == 'false' && needs.checks.outputs.stable_image_exists != 'true' && needs.checks.outputs.docs_only == 'false') }}
749+
750+
tag-results:
751+
if: ${{ always() }}
752+
runs-on: ubuntu-22.04
753+
name: Final CI Results
754+
needs: [tag-stable]
755+
steps:
756+
- run: |
757+
result="${{ needs.tag-stable.result }}"
758+
if [[ $result == "success" || $result == "skipped" ]]; then
759+
exit 0
760+
else
761+
exit 1
762+
fi
763763
764764
trigger-image-promotion:
765765
name: Promote images on Force Run
766766
needs:
767767
- build-docker
768768
- build-docker-plus
769769
- build-docker-nap
770-
- smoke-results
770+
- tag-results
771771
permissions:
772772
contents: write # for pushing to Helm Charts repository
773773
id-token: write # To sign into Google Container Registry

0 commit comments

Comments
 (0)