Skip to content

Commit adb4fd0

Browse files
authored
fix: tag comparison
`is_stable` doesn't work as expected
1 parent 3dd0be3 commit adb4fd0

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
outputs:
2525
is_new_version: ${{ steps.compare_tags.outputs.is_greater_a }}
26-
is_stable: ${{ steps.compare_tags.outputs.is_stable_a }}
26+
rc_source_tag: ${{ steps.compare_tags.outputs.rc_a }}
2727
current_source_tag: ${{ steps.get_latest_source_tag.outputs.tag }}
2828
new_image_tag: ${{ steps.get_new_image_tag.outputs.new_image_tag }}
2929
new_image_tag_suffix: ${{ steps.get_new_image_tag.outputs.new_image_tag_suffix }}
@@ -87,11 +87,11 @@ jobs:
8787
CURRENT_IMAGE_TAG: ${{ steps.get_latest_image_tag.outputs.latest_tag_with_base_version }}
8888
CURRENT_SOURCE_TAG: ${{ steps.get_latest_source_tag.outputs.current }}
8989
IS_NEW_SOURCE_TAG: ${{ steps.compare_tags.outputs.is_greater_a }}
90-
IS_NEW_SOURCE_TAG_STABLE: ${{ steps.compare_tags.outputs.is_stable_a }}
90+
NEW_SOURCE_TAG_RC: ${{ steps.compare_tags.outputs.rc_source_tag }}
9191
IS_NEW_IMAGE_BASE: ${{ steps.base_image_update_check.outputs.needs-updating }}
9292
run: |
9393
# Decide which tag to use for the new image
94-
if [[ "$IS_NEW_SOURCE_TAG" == "true" && "$IS_NEW_SOURCE_TAG_STABLE" == "true" ]]; then
94+
if [[ "$IS_NEW_SOURCE_TAG" == "true" && "$NEW_SOURCE_TAG_RC" == "" ]]; then
9595
new_image_tag="${CURRENT_SOURCE_TAG}"
9696
new_base=1
9797
elif [[ "$IS_NEW_IMAGE_BASE" == "true" ]]; then
@@ -129,7 +129,7 @@ jobs:
129129
build-push-envs:
130130
runs-on: ubuntu-22.04
131131
needs: [compare]
132-
if: (needs.compare.outputs.is_new_version == 'true' && needs.compare.outputs.is_stable == 'true') || needs.compare.outputs.is_new_base_image == 'true'
132+
if: (needs.compare.outputs.is_new_version == 'true' && needs.compare.outputs.rc_source_tag == '') || needs.compare.outputs.is_new_base_image == 'true'
133133
outputs:
134134
image_uri: ${{ steps.env-to-output.outputs.image_uri }}
135135
image_registry: ${{ steps.env-to-output.outputs.image_registry }}
@@ -152,7 +152,7 @@ jobs:
152152
contents: read
153153
packages: write
154154
needs: [build-push-envs, compare]
155-
if: (needs.compare.outputs.is_new_version == 'true' && needs.compare.outputs.is_stable == 'true') || needs.compare.outputs.is_new_base_image == 'true'
155+
if: (needs.compare.outputs.is_new_version == 'true' && needs.compare.outputs.rc_source_tag == '') || needs.compare.outputs.is_new_base_image == 'true'
156156
with:
157157
registry: ${{ needs.build-push-envs.outputs.image_registry }}
158158
image_uri: ${{ needs.build-push-envs.outputs.image_uri }}

0 commit comments

Comments
 (0)